Merge pull request #86 from ArangoGutierrez/remotedockerfile

Use k8s-test-infra devel image

Makefile

@@ -36,7 +36,8 @@ TARGETS := $(MAKE_TARGETS) $(CMD_TARGETS)
 
 DOCKER_TARGETS := $(patsubst %,docker-%, $(TARGETS))
 .PHONY: $(TARGETS) $(DOCKER_TARGETS)
-DOCKERFILE_DEVEL := $(CURDIR)/deployments/container/Dockerfile.devel
+DOCKERFILE_DEVEL ?= "images/devel/Dockerfile"
+DOCKERFILE_CONTEXT ?= "https://github.com/NVIDIA/k8s-test-infra.git"
 
 GOOS ?= linux
 ifeq ($(VERSION),)
@@ -140,7 +141,7 @@ generate-clientset: .remove-clientset .remove-deepcopy .remove-crds
 .remove-clientset:
 	rm -rf $(CURDIR)/$(PKG_BASE)/clientset
 
-build-image: $(DOCKERFILE_DEVEL)
+build-image:
 	$(DOCKER) build \
 		--progress=plain \
 		--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
@@ -150,7 +151,7 @@ build-image: $(DOCKERFILE_DEVEL)
 		--build-arg MOQ_VERSION="$(MOQ_VERSION)" \
 		--tag $(BUILDIMAGE) \
 		-f $(DOCKERFILE_DEVEL) \
-		.
+		$(DOCKERFILE_CONTEXT)
 
 $(DOCKER_TARGETS): docker-%:
 	@echo "Running 'make $(*)' in container image $(BUILDIMAGE)"

demo/clusters/kind/scripts/build-driver-image.sh

@@ -35,8 +35,8 @@ cd ${PROJECT_DIR}
 
 # Regenerate the CRDs and build the container image
 # TODO: This should be part of the image name
-make docker-generate
 make build-image
+make docker-generate
 make -f deployments/container/Makefile build
 
 cd ${CURRENT_DIR}