Add structure-test stage to Dockerfile for local builds

Co-authored-by: neilime <[email protected]>

Author: Copilot

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/super-linter/super-linter:slim-v8.0.0
+FROM ghcr.io/super-linter/super-linter:slim-v8.0.0 AS linter
 
 HEALTHCHECK --interval=5m --timeout=10s --start-period=30s --retries=3 CMD ["/bin/sh","-c","test -d /github/home"]
 ARG UID=1000
@@ -10,3 +10,7 @@ ENV RUN_LOCAL=true
 ENV USE_FIND_ALGORITHM=true
 ENV LOG_LEVEL=WARN
 ENV LOG_FILE="/github/home/logs"
+
+FROM ghcr.io/googlecontainertools/container-structure-test:1.22.0 AS structure-test
+
+HEALTHCHECK --interval=5m --timeout=10s --start-period=30s --retries=3 CMD ["container-structure-test", "version"]

Makefile

@@ -36,7 +36,7 @@ define run_linter
 	DEFAULT_WORKSPACE="$(CURDIR)"; \
 	LINTER_IMAGE="linter:latest"; \
 	VOLUME="$$DEFAULT_WORKSPACE:$$DEFAULT_WORKSPACE"; \
-	docker build --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag $$LINTER_IMAGE .; \
+	docker build --target linter --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag $$LINTER_IMAGE .; \
 	docker run \
 		-e DEFAULT_WORKSPACE="$$DEFAULT_WORKSPACE" \
 		-e FILTER_REGEX_INCLUDE="$(filter-out $@,$(MAKECMDGOALS))" \
@@ -61,11 +61,13 @@ define run_tests
 	fi; \
 	echo "Building image $$IMAGE_NAME..."; \
 	docker buildx build -t "$$IMAGE_NAME:test" "$$IMAGE_DIR" || exit 1; \
+	echo "Building structure-test image..."; \
+	docker build --target structure-test --tag structure-test:latest . || exit 1; \
 	echo "Running tests for $$IMAGE_NAME..."; \
 	docker run --rm \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v "$$IMAGE_DIR:/workspace" \
-		ghcr.io/googlecontainertools/container-structure-test:v1.22.0 \
+		structure-test:latest \
 		test --image "$$IMAGE_NAME:test" --config /workspace/container-structure-test.yaml
 endef