chore: fix test-registry Makefile target (#196)

Author: johnstcn

Makefile

@@ -14,38 +14,44 @@ docs: options.go
 	go run ./scripts/docsgen/main.go
 
 .PHONY: test
-test: test-registry test-images
+test: test-registry
 	go test -count=1 ./...
 
 test-race:
 	go test -race -count=3 ./...
 
 # Starts a local Docker registry on port 5000 with a local disk cache.
 .PHONY: test-registry
-test-registry: .registry-cache
+test-registry: test-registry-container test-images-pull test-images-push
+
+.PHONY: test-registry-container
+test-registry-container: .registry-cache
 	if ! curl -fsSL http://localhost:5000/v2/_catalog > /dev/null 2>&1; then \
 		docker rm -f envbuilder-registry && \
 		docker run -d -p 5000:5000 --name envbuilder-registry --volume $(PWD)/.registry-cache:/var/lib/registry registry:2; \
 	fi
 
 # Pulls images referenced in integration tests and pushes them to the local cache.
-.PHONY: test-images
-test-images: .registry-cache .registry-cache/docker/registry/v2/repositories/envbuilder-test-alpine .registry-cache/docker/registry/v2/repositories/envbuilder-test-ubuntu .registry-cache/docker/registry/v2/repositories/envbuilder-test-codercom-code-server
+.PHONY: test-images-push
+test-images-push: .registry-cache/docker/registry/v2/repositories/envbuilder-test-alpine .registry-cache/docker/registry/v2/repositories/envbuilder-test-ubuntu .registry-cache/docker/registry/v2/repositories/envbuilder-test-codercom-code-server
+
+.PHONY: test-images-pull
+test-images-pull:
+	docker pull alpine:latest
+	docker tag alpine:latest localhost:5000/envbuilder-test-alpine:latest
+	docker pull ubuntu:latest
+	docker tag ubuntu:latest localhost:5000/envbuilder-test-ubuntu:latest
+	docker pull codercom/code-server:latest
+	docker tag codercom/code-server:latest localhost:5000/envbuilder-test-codercom-code-server:latest
 
 .registry-cache:
 	mkdir -p .registry-cache && chmod -R ag+w .registry-cache
 
 .registry-cache/docker/registry/v2/repositories/envbuilder-test-alpine:
-	docker pull alpine:latest
-	docker tag alpine:latest localhost:5000/envbuilder-test-alpine:latest
 	docker push localhost:5000/envbuilder-test-alpine:latest
 
 .registry-cache/docker/registry/v2/repositories/envbuilder-test-ubuntu:
-	docker pull ubuntu:latest
-	docker tag ubuntu:latest localhost:5000/envbuilder-test-ubuntu:latest
 	docker push localhost:5000/envbuilder-test-ubuntu:latest
 
 .registry-cache/docker/registry/v2/repositories/envbuilder-test-codercom-code-server:
-	docker pull codercom/code-server:latest
-	docker tag codercom/code-server:latest localhost:5000/envbuilder-test-codercom-code-server:latest
 	docker push localhost:5000/envbuilder-test-codercom-code-server:latest