Merge remote-tracking branch 'origin/master' into feature/envoy

This commit is contained in:
Caleb Doxsey 2020-05-08 11:17:30 -06:00 committed by Travis Groth
parent 99e788a9b4
commit 02615b8b6c
48 changed files with 1283 additions and 561 deletions

View file

@ -40,11 +40,5 @@ ENTRYPOINT [ "/bin/pomerium" ]
CMD ["-config","/pomerium/config.yaml"]
EOF
docker build --tag=pomerium/pomerium:dev .
# build for minikube
if command -v minikube >/dev/null 2>&1; then
eval "$(minikube docker-env --shell=bash)"
docker build --tag=pomerium/pomerium:dev .
fi
kind load docker-image pomerium/pomerium:dev
)