istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automator: update common-files@master in istio/istio.io@master (#7397)

This commit is contained in:
Istio Automation 2020-05-26 07:12:28 -07:00 committed by GitHub
parent b5f5fd897d
commit 23a4f5df4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/.commonfiles.sha
View File

@ -1 +1 @@
d1c990b8e308d92fe3a76db64f2c9ad11714b0ba
8a135fef7f1b622ef6da9ccbe4b35f312a079654

8
common/scripts/run.sh
View File

@ -47,8 +47,8 @@ export REPO_ROOT=/work
--env-file <(env | grep -v ${ENV_BLOCKLIST}) \
-e IN_BUILD_CONTAINER=1 \
-e TZ="${TIMEZONE:-$TZ}" \
--mount "type=bind,source=${PWD},destination=/work" \
--mount "type=volume,source=go,destination=/go" \
--mount "type=volume,source=gocache,destination=/gocache" \
--mount "type=bind,source=${PWD},destination=/work,consistency=delegated" \
--mount "type=volume,source=go,destination=/go,consistency=delegated" \
--mount "type=volume,source=gocache,destination=/gocache,consistency=delegated" \
${CONDITIONAL_HOST_MOUNTS} \
-w /work "${IMG}" "$@"
-w /work "${IMG}" "$@"

8
common/scripts/setup_env.sh
View File

@ -95,20 +95,20 @@ export CONDITIONAL_HOST_MOUNTS=${CONDITIONAL_HOST_MOUNTS:-}
# docker conditional host mount (needed for make docker push)
if [[ -d "${HOME}/.docker" ]]; then
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.docker,destination=/config/.docker,readonly "
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.docker,destination=/config/.docker,readonly,consistency=delegated "
fi
# gcloud conditional host mount (needed for docker push with the gcloud auth configure-docker)
if [[ -d "${HOME}/.config/gcloud" ]]; then
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.config/gcloud,destination=/config/.config/gcloud,readonly "
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.config/gcloud,destination=/config/.config/gcloud,readonly,consistency=delegated "
fi
# Conditional host mount if KUBECONFIG is set
if [[ -n "${KUBECONFIG}" ]]; then
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=$(dirname "${KUBECONFIG}"),destination=/home/.kube,readonly "
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=$(dirname "${KUBECONFIG}"),destination=/home/.kube,readonly,consistency=delegated "
elif [[ -f "${HOME}/.kube/config" ]]; then
# otherwise execute a conditional host mount if $HOME/.kube/config is set
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube,readonly "
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube,readonly,consistency=delegated "
fi
# Avoid recursive calls to make from attempting to start an additional container