diff --git a/.env.dist b/.env.dist index 4a85c532..f426902f 100644 --- a/.env.dist +++ b/.env.dist @@ -1,2 +1,2 @@ -GITHUB_USER= -GITHUB_TOKEN= +GITHUB_USER=github: github user +GITHUB_TOKEN=github: github token diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 0d4fb891..f094cdf6 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -33,17 +33,17 @@ jobs: #- name: License check # uses: apache/skywalking-eyes@main # continue-on-error: true + - name: Task + run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin - name: Registry login - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Buildx install - uses: crazy-max/ghaction-docker-buildx@v1 - - name: Task - run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin - - name: Setup - run: task setup + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Build - run: task build-and-push + run: task build-common PUSH=y diff --git a/.gitignore b/.gitignore index fae0e636..6953c7fe 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ pkg/ .env virtulenv/ node_modules/ +.env +.env.nuv diff --git a/Taskfile.yml b/Taskfile.yml index 5e326004..cef715b4 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -54,7 +54,6 @@ tasks: else {{.DRY}} docker buildx build -t "{{.COMMON}}" . --load fi - build-runtime: requires: { vars: [RT, VER] } dir: "runtime/{{.RT}}/{{.VER}}" @@ -80,13 +79,14 @@ tasks: VER: "{{base .ITEM}}" build: - - task: build-common + - task build-common - task build-lang RT=golang - task build-lang RT=python - task build-lang RT=nodejs build-and-push: - - task build PUSH=y + #- task build PUSH=y + - task build-common PUSH=y run-runtime: requires: { vars: [RT, VER] }