Next attempt.

Author: Gerrit91

.github/workflows/docker.yaml

@@ -34,9 +34,6 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Test
-      run: make test
-
     - name: Make tag
       run: |
         [ "${GITHUB_EVENT_NAME}" == 'pull_request' ] && echo "tag=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV || true
@@ -46,6 +43,20 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Build and export minimal image to Docker
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        load: true
+        tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.tag }}-minimal
+        target: minimal
+
+    - name: Test
+      run: |
+        make test
+      env:
+        VERSION: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.tag }}-minimal
+
     - name: Build and push minimal image
       uses: docker/build-push-action@v6
       with:

Dockerfile.test

@@ -1,2 +1,3 @@
-FROM metal-deployment-base
+ARG VERSION=metal-deployment-base
+FROM ${VERSION}
 COPY test .

Makefile

@@ -1,12 +1,16 @@
+VERSION := $(or $(VERSION),metal-deployment-base)
 ifeq ($(CI),true)
   DOCKER_RUN_ARG=
 else
   DOCKER_RUN_ARG=t
 endif
 
+.PHONY: build
+build:
+	docker build -t $(VERSION) .
+
 .PHONY: test
 test:
-	docker build -t metal-deployment-base .
-	docker build -t metal-deployment-base-test -f Dockerfile.test .
-	docker run --rm -i$(DOCKER_RUN_ARG) metal-deployment-base-test bash -c \
+	docker build -t $(VERSION)-test -f Dockerfile.test --build-arg=$(VERSION) .
+	docker run --rm -i$(DOCKER_RUN_ARG) $(VERSION)-test bash -c \
 		'ansible -m metalstack.base.metal_stack_release_vector localhost && find ~/.ansible/roles -maxdepth 1 -type d -ls'