Merge pull request #383 from doitintl/ci-fix-latest

ci: Fix latest tag and avoid rebuild
doitintl · Oct 6, 2022 · 126e47b · 126e47b
2 parents c5d5211 + b6018d5
commit 126e47b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -169,17 +169,12 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.create-release.outputs.tag_name }}
+          tags: |
+            ${{ format('{0}/{1}:{2}', env.REGISTRY, env.IMAGE_NAME, needs.create-release.outputs.tag_name) }}
+            ${{ !startsWith(github.ref, 'refs/tags/nightly') && format('{0}/{1}:{2}', env.REGISTRY, env.IMAGE_NAME, 'latest') }}
           build-args: |
             GITHUB_REF
             GITHUB_SHA
-      - name: Push latest
-        uses: docker/build-push-action@v3
-        if: ${{ !contains(github.ref, 'nightly') }}
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
   release-artifacts:
     name: Release Artifacts
     needs:

diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,6 @@ RUN go mod download
 COPY cmd cmd
 COPY pkg pkg
 COPY Makefile Makefile
-RUN export
 RUN make all
 
 FROM scratch