Merge pull request #3159 from kirs/fix-dev-env.sh

Pass --shell to minikube docker-env
This commit is contained in:
k8s-ci-robot 2018-09-29 14:43:34 -07:00 committed by GitHub
commit 0f56609692
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -33,13 +33,13 @@ if [ -z "${SKIP_MINIKUBE_START}" ]; then
--extra-config=kubelet.sync-frequency=1s \ --extra-config=kubelet.sync-frequency=1s \
--extra-config=apiserver.authorization-mode=RBAC --extra-config=apiserver.authorization-mode=RBAC
eval $(minikube docker-env) eval $(minikube docker-env --shell bash)
fi fi
echo "[dev-env] building container" echo "[dev-env] building container"
make build container make build container
docker save "${DEV_IMAGE}" | (eval $(minikube docker-env) && docker load) || true docker save "${DEV_IMAGE}" | (eval $(minikube docker-env --shell bash) && docker load) || true
echo "[dev-env] installing kubectl" echo "[dev-env] installing kubectl"
kubectl version || brew install kubectl kubectl version || brew install kubectl