diff options
Diffstat (limited to 'server/test/Makefile')
| -rw-r--r-- | server/test/Makefile | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/server/test/Makefile b/server/test/Makefile index 4946458..12b18ec 100644 --- a/server/test/Makefile +++ b/server/test/Makefile @@ -7,12 +7,14 @@ DOCKER_OS = $(patsubst %.Dockerfile.in, %, \ $(notdir $(wildcard docker/templates/*.Dockerfile.in))) # Arguments to pass to docker build . -DOCKER_BUILD_ARGS = -q +DOCKER_BUILD_ARGS = -q -t # Advice make not to delete these "intermediate" files. -.PRECIOUS: docker/%.Dockerfile docker/.%.build +.PRECIOUS: docker/%.Dockerfile docker/.%.build docker/.%.container -.PHONY: all test check docker/build +# Avoid conflicts with real files +SUBDIRS = docker +.PHONY: subdirs $(SUBDIRS) all: docker/test test: docker/test @@ -24,16 +26,22 @@ docker/%.Dockerfile: docker/templates/%.Dockerfile.in \ @echo Creating Dockerfile for target $* cat $^ > $@ -# Build the Dockerfile +# Build the Docker Image docker/.%.build: docker/%.Dockerfile ../autobuild docker/lib - @echo Building target $* - podman image build $(DOCKER_BUILD_ARGS) -t epdfinfo/$* -f $< ../ || exit 0 + @echo Building target image $* + podman image build $(DOCKER_BUILD_ARGS) epdfinfo/$* -f $< ../ touch $@ -# Run the Dockerfile -docker/%: docker/.%.build +# Build the Docker Container +docker/.%.container: docker/.%.build + @echo Building target container $* + podman container create $(DOCKER_BUILD_ARGS) --name epdfinfo-$* epdfinfo/$* + touch $@ + +# Run the Containers generated by the dockerfile +docker/%: docker/.%.container @echo Running tests on target $* - podman container run --rm --name epdfinfo-$* epdfinfo/$* + podman container start -a epdfinfo-$* # Run all Dockerfiles docker/test: docker/build $(patsubst %, docker/%, $(DOCKER_OS)) @@ -49,6 +57,7 @@ docker/clean: $(patsubst %, docker/.%.clean, $(DOCKER_OS)) clean: docker/clean rm -f -- docker/.[^.]*.build + rm -f -- docker/.[^.]*.container rm -f -- docker/*.Dockerfile print: |