test: build test images automatically using docker compose

KSmanis · Oct 5, 2024 · 5f52a7e · 5f52a7e
1 parent 65f27d2
commit 5f52a7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,19 +72,9 @@ jobs:
       - name: Inspect image
         run: |
           docker image inspect ${{ steps.build.outputs.imageid }}
-      - name: Build test image
-        id: build-test
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6
-        with:
-          context: .
-          platforms: linux/${{ matrix.arch }}
-          target: distcc-${{ matrix.target }}-test
-          load: true
       - name: Test distcc
         env:
           DOCKER_DEFAULT_PLATFORM: linux/${{ matrix.arch }}
-          IMAGE: ${{ steps.build.outputs.imageid }}
-          TEST_IMAGE: ${{ steps.build-test.outputs.imageid }}
         run: |
           docker compose --ansi always -f docker-compose.test.yml -p test up \
             --exit-code-from distcc-${{ matrix.target }}-client \

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -1,7 +1,8 @@
 ---
 services:
   distcc-tcp-server:
-    image: ${IMAGE}
+    build:
+      target: distcc-tcp
     healthcheck:
       interval: 3s
       start_period: 30s
@@ -10,12 +11,14 @@ services:
     depends_on:
       distcc-tcp-server:
         condition: service_healthy
-    image: ${TEST_IMAGE}
+    build:
+      target: distcc-tcp-test
     environment:
       - DISTCC_HOSTS=distcc-tcp-server
 
   distcc-ssh-server:
-    image: ${IMAGE}
+    build:
+      target: distcc-ssh
     healthcheck:
       interval: 3s
       start_period: 30s
@@ -26,6 +29,7 @@ services:
     depends_on:
       distcc-ssh-server:
         condition: service_healthy
-    image: ${TEST_IMAGE}
+    build:
+      target: distcc-ssh-test
     environment:
       - DISTCC_HOSTS=@distcc-ssh-server