From a7a2c82931ef6d489d2a0dfced45df357182b37f Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Thu, 28 Apr 2022 13:46:04 -0400 Subject: [PATCH] feat(dbtest): Add docker-load Makefile target The new docker-load target uses docker buildx to build a local image of each of the Dockerfiles, and load them into the local docker socket image store. --- testing/dbtest/docker/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testing/dbtest/docker/Makefile b/testing/dbtest/docker/Makefile index d29680f526..8818bbb5e1 100644 --- a/testing/dbtest/docker/Makefile +++ b/testing/dbtest/docker/Makefile @@ -13,6 +13,7 @@ TEST_CONTAINER_NAME ?= boundary-sql-tests # Generate targets from dockerfiles dockerfiles = $(wildcard Dockerfile.*) docker-buildxs = $(patsubst Dockerfile.%,%-buildx, $(dockerfiles)) +docker-load-buildxs = $(patsubst Dockerfile.%,%-load-buildx, $(dockerfiles)) # Before running this target a builder instance needs to be setup, ie: # docker buildx create --driver docker-container --use @@ -25,6 +26,14 @@ ${docker-buildxs}: %-buildx: -t $(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ -f Dockerfile.$* . +docker-load: ${docker-load-buildxs} + +${docker-load-buildxs}: %-load-buildx: + docker buildx build \ + --load \ + -t $(REGISTRY_NAME)/$(TEST_IMAGE_NAME):$* \ + -f Dockerfile.$* . + database-up: @echo "Using image: $(TEST_IMAGE_TAG)" @echo "Additional postgres configuration: $(PG_OPTS)" @@ -49,4 +58,4 @@ clean: docker stop $(TEST_CONTAINER_NAME) || true docker rm -v $(TEST_CONTAINER_NAME) || true -.PHONY: all docker-build database-up ${docker-buildxs} clean +.PHONY: all docker-build database-up ${docker-buildxs} ${docker-load-buildxs} clean