fix docker builds

Author: kjubybot

.github/workflows/master.yml

@@ -113,26 +113,13 @@ jobs:
           file: ./services/app/assp/codebattle/cover/excoveralls.json
           fail_ci_if_error: false
 
-  codebattle-docker-matrix:
+  codebattle-docker:
     if: github.repository == 'hexlet-codebattle/codebattle'
     runs-on: ubuntu-latest
     timeout-minutes: 30 # Add timeout to prevent hanging builds
     needs: build
 
-    strategy:
-      matrix:
-        target:
-          - assets-image
-          - compile-image
-          - nginx-assets
-          - runtime-image
-        include:
-          - target: runtime-image
-            tag: latest
-
     steps:
-      - uses: actions/checkout@v4
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -142,37 +129,65 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build codebattle ${{ matrix.target }}
+      - name: Build codebattle assets-image
+        uses: docker/build-push-action@v6
+        with:
+          context: services/app
+          file: services/app/Dockerfile.codebattle
+          build-args: |
+            GIT_HASH=${{ github.sha }}
+          push: ${{ github.ref_name == 'master' }}
+          target: assets-image
+          tags: codebattle/codebattle:assets-image
+          cache-to: type=registry,ref=codebattle/codebattle:assets-image-buildcache
+          cache-from: type=registry,ref=codebattle/codebattle:assets-image-buildcache,image-manifest=true
+
+      - name: Build codebattle compile-image
+        uses: docker/build-push-action@v6
+        with:
+          context: services/app
+          file: services/app/Dockerfile.codebattle
+          build-args: |
+            GIT_HASH=${{ github.sha }}
+          push: ${{ github.ref_name == 'master' }}
+          target: compile-image
+          tags: codebattle/codebattle:compile-image
+          cache-to: type=registry,ref=codebattle/codebattle:compile-image-buildcache
+          cache-from: type=registry,ref=codebattle/codebattle:compile-image-buildcache,image-manifest=true
+
+      - name: Build codebattle nginx-assets
+        uses: docker/build-push-action@v6
+        with:
+          context: services/app
+          file: services/app/Dockerfile.codebattle
+          build-args: |
+            GIT_HASH=${{ github.sha }}
+          push: ${{ github.ref_name == 'master' }}
+          target: nginx-assets
+          tags: codebattle/codebattle:nginx-assets
+          cache-to: type=registry,ref=codebattle/codebattle:nginx-assets-buildcache
+          cache-from: type=registry,ref=codebattle/codebattle:nginx-assets-buildcache,image-manifest=true
+
+      - name: Build codebattle runtime-image
         uses: docker/build-push-action@v6
         with:
           context: services/app
           file: services/app/Dockerfile.codebattle
           build-args: |
             GIT_HASH=${{ github.sha }}
           push: ${{ github.ref_name == 'master' }}
-          target: ${{ matrix.target }}
-          tags: codebattle/codebattle:${{ matrix.tag != '' && matrix.tag|| matrix.target }}
-          cache-to: type=registry,ref=codebattle/codebattle:${{ matrix.target }}-buildcache
-          cache-from: type=registry,ref=codebattle/codebattle:${{ matrix.target }}-buildcache,image-manifest=true
+          target: runtime-image
+          tags: codebattle/codebattle:latest
+          cache-to: type=registry,ref=codebattle/codebattle:runtime-image-buildcache
+          cache-from: type=registry,ref=codebattle/codebattle:runtime-image-buildcache,image-manifest=true
 
-  runner-docker-matrix:
+  runner-docker:
     if: github.repository == 'hexlet-codebattle/codebattle'
     runs-on: ubuntu-latest
     timeout-minutes: 30 # Add timeout to prevent hanging builds
     needs: build
 
-    strategy:
-      matrix:
-        target:
-          - compile-image
-          - runtime-image
-        include:
-          - target: runtime-image
-            tag: latest
-
     steps:
-      - uses: actions/checkout@v4
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -182,16 +197,27 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build runner ${{ matrix.target }}
+      - name: Build runner compile-image
+        uses: docker/build-push-action@v6
+        with:
+          context: services/app
+          file: services/app/Dockerfile.runner
+          push: ${{ github.ref_name == 'master' }}
+          target: compile-image
+          tags: codebattle/runner:compile-image
+          cache-to: type=registry,ref=codebattle/runner:compile-image-buildcache
+          cache-from: type=registry,ref=codebattle/runner:compile-image-buildcache,image-manifest=true
+
+      - name: Build runner runtime-image
         uses: docker/build-push-action@v6
         with:
           context: services/app
           file: services/app/Dockerfile.runner
           push: ${{ github.ref_name == 'master' }}
-          target: ${{ matrix.target }}
-          tags: codebattle/runner:${{ matrix.tag != '' && matrix.tag|| matrix.target }}
-          cache-to: type=registry,ref=codebattle/runner:${{ matrix.target }}-buildcache
-          cache-from: type=registry,ref=codebattle/runner:${{ matrix.target }}-buildcache,image-manifest=true
+          target: runtime-image
+          tags: codebattle/runner:latest
+          cache-to: type=registry,ref=codebattle/runner:runtime-image-buildcache
+          cache-from: type=registry,ref=codebattle/runner:runtime-image-buildcache,image-manifest=true
 
       # stop integratoin tests on CI becaues of https://github.com/hexlet-codebattle/codebattle/runs/580337561?check_suite_focus=true
       # - name: Pull dockers