Remove buildx setup

nimblehq · Jan 19, 2024 · 4e99157 · 4e99157
1 parent 2692d6e
commit 4e99157
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -36,8 +36,8 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
       - name: Set BRANCH_TAG
         uses: nimblehq/branch-tag-action@v1
@@ -55,9 +55,9 @@ jobs:
 
       - name: Set DOCKER_IMAGE_TAG env variable
         run: |
-          echo "DOCKER_IMAGE_TAG=${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ env.BRANCH_TAG }}" >> $GITHUB_ENV
+          echo "DOCKER_IMAGE_TAG=$DOCKER_REGISTRY/$DOCKER_IMAGE:$BRANCH_TAG" >> $GITHUB_ENV
           echo "MAKE UP DOCKER IMAGE TAG"
-          echo ${{ env.DOCKER_IMAGE_TAG }}
+          echo $DOCKER_IMAGE_TAG
 
       - name: Prepare Docker image
         run: |
@@ -70,14 +70,19 @@ jobs:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_TOKEN }}
 
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.DOCKER_IMAGE_TAG }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      # - name: Docker build and push
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     context: .
+      #     push: true
+      #     tags: ${{ env.DOCKER_IMAGE_TAG }}
+      #     cache-from: type=gha
+      #     cache-to: type=gha,mode=max
+      - name: Build Docker image
+        run: |
+          bin/docker-prepare
+          docker-compose build
+          docker-compose push web
 
       - name: Log in to Heroku container
         run: heroku container:login