Merge pull request #10 from paulfantom/glide_in_docker

run glide in docker container
enxebre · Jul 19, 2018 · 64ad395 · 64ad395
2 parents f3d425e + db9d4d6
commit 64ad395
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -55,6 +55,11 @@ clean-images: ## Remove built images
 	docker rmi -f apiserverbuilderimage > /dev/null 2>&1 || true
 	docker rmi -f buildimage > /dev/null 2>&1 || true
 
+.PHONY: deps
+deps: .buildImage
+	$(DOCKER_CMD) glide install --strip-vendor
+	$(DOCKER_CMD) glide-vc --use-lock-file --no-tests --only-code
+
 # Build
 #######
 

diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 ## Build the controller
 Update dependencies if needed:
 ```
-glide install --strip-vendor
-glide-vc --use-lock-file --no-tests --only-code
+make deps
 ```
 Then:
 

diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
@@ -23,6 +23,7 @@ ENV GLIDE_VERSION=v0.12.3 \
     GLIDE_HOME=/go/src/github.com/openshift/cluster-operator/.glide
 RUN curl -sSL https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz \
     | tar -vxz -C /usr/local/bin --strip=1
+RUN go get -u github.com/sgotti/glide-vc
 
 # Install the golint, use this to check our source for niceness
 RUN go get -u github.com/golang/lint/golint