fix workflows

ironpinguin · Nov 1, 2021 · a0f477d · a0f477d
1 parent 0c5c931
commit a0f477d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,18 +56,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        if: ${{ 'refs/heads/main' == github.ref }}
-        id: docker_build_push
+        id: docker_build
         uses: docker/build-push-action@v2
         with:
-          push: true
-          tags: "ironpinguin/terraform_http_backend:${{ github.sha }}"
-      - name: only Build
-        if: ${{ 'refs/heads/main' != github.ref }}
-        id: docker_build_only
-        uses: docker/build-push-action@v2
-        with:
-          push: false
+          push: ${{ 'refs/heads/main' == github.ref }}
           tags: "ironpinguin/terraform_http_backend:${{ github.sha }}"
 
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -52,6 +52,4 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: 
-            - "ironpinguin/terraform_http_backend:${{ github.sha }}"
-            - "ironpinguin/terraform_http_backend:${{ steps.get_version.outputs.VERSION }}"
+          tags: "ironpinguin/terraform_http_backend:${{ github.sha }},ironpinguin/terraform_http_backend:${{ steps.get_version.outputs.VERSION }}"