fix action

usernaimandrey · Oct 6, 2023 · f3adbc9 · f3adbc9
1 parent ddd7d46
commit f3adbc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -6,7 +6,7 @@ on:
       - 'main'
 
 env:
-  TEST_TAG: shlyapnikovan/collective_blog
+  APP_IMAGE_NAME: shlyapnikovan/collective_blog
 
 jobs:
   docker:
@@ -24,15 +24,15 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
 
-      - name: Build App
-        uses: docker/build-push-action@v2
+     - name: Build App
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: Dockerfile.production
-          cache-from: type=registry,ref=${{ env.TEST_TAG }}:cached
+          cache-from: type=registry,ref=${{ env.APP_IMAGE_NAME }}
           cache-to: type=inline
           push: true
-          tags: ${{ env.TEST_TAG }}:cached
+          tags: ${{ env.APP_IMAGE_NAME }}
 
       - name: Check
         run: make compose-production-test
@@ -42,6 +42,6 @@ jobs:
         with:
           context: .
           file: Dockerfile.production
-          cache-from: type=registry,ref=${{ env.TEST_TAG }}:cached
+          cache-from: type=registry,ref=${{ env.APP_IMAGE_NAME }}:cached
           push: true
-          tags: ${{ env.TEST_TAG }}:latest
+          tags: ${{ env.APP_IMAGE_NAME }}:latest
diff --git a/make-compose.mk b/make-compose.mk
@@ -27,6 +27,6 @@ compose-production-build:
 
 compose-production-test:
 	make prepare-env
-	docker-compose -f docker-compose.yml up --abort-on-container-exit --exit-code-from app
+	docker-compose -f docker-compose.yml up --abort-on-container-exit
 
 compose-setup: compose-down compose-build compose-install