Skip to content

H
helm3
Commit 326dca8d authored by Adam Reese's avatar Adam Reese Committed by GitHub
Browse files
Options

Merge pull request #934 from adamreese/fix/ci-docker-build 

fix(ci): move docker-build out of parallel step
parents e7da8783 c5682803
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
circle.yml
View file @ 326dca8d
...@@ -41,4 +41,5 @@ deployment: ...@@ -41,4 +41,5 @@ deployment:
commands: commands:
- echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
- docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
- make docker-build
- docker push gcr.io/kubernetes-helm/tiller:canary - docker push gcr.io/kubernetes-helm/tiller:canary
scripts/ci.sh
View file @ 326dca8d
...@@ -31,8 +31,4 @@ case "${CIRCLE_NODE_INDEX-0}" in ...@@ -31,8 +31,4 @@ case "${CIRCLE_NODE_INDEX-0}" in
echo "Running 'make test-style'" echo "Running 'make test-style'"
make test-style make test-style
;; ;;
2)
echo "Running 'make docker-build'"
make docker-build
;;
esac esac
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment