fix(max-depth) compress the test base image so it doesnt grow layers …

…forever (#248)
Kong · Mar 26, 2020 · 38d5326 · 38d5326
1 parent 80de082
commit 38d5326
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -255,14 +255,18 @@ ifneq ($(RESTY_IMAGE_BASE),src)
 	docker tag $(DOCKER_REPOSITORY):openresty-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_OPENRESTY_SUFFIX) \
 	$(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX) )
 
+	docker run -d --rm --name test $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX) tail -f /dev/null
+	docker export test | docker import - $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX)
+	docker stop test
+
 	$(DOCKER_COMMAND) -f test/Dockerfile.test \
 	--build-arg KONG_GO_PLUGINSERVER_VERSION=$(KONG_GO_PLUGINSERVER_VERSION) \
 	--build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \
 	--build-arg DOCKER_OPENRESTY_SUFFIX=$(DOCKER_OPENRESTY_SUFFIX) \
 	-t $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) .
-
 	docker tag $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) $(DOCKER_REPOSITORY):test
-	docker tag $(DOCKER_REPOSITORY):test $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX)
+	docker tag $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX)
+
 	-$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX)
 endif