townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DBE - avoid retrying from other public registries.

Browse Source
This commit is contained in:
Yao Wei Tjong 姚伟忠 2020-08-10 13:15:11 +08:00
parent 0b9c49cab8
commit 6ae88f9b44
No known key found for this signature in database
GPG Key ID: 0296FF46D1EE7308
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
script/dockerized.sh
View File

@ -41,6 +41,8 @@ if ! docker --version >/dev/null 2>&1; then
run_option="--security-opt label=disable"
# Podman mount volume as 'noexec' by default but we need 'exec' for Android build (aapt2 permission denied otherwise)
mount_option=,exec
# Podman by default pull from other OS registries before trying 'docker.io', so we need to be more explicit to avoid the retries
registry=docker.io/
else
echo "Could not find Docker client or podman"
exit 1
@ -57,9 +59,9 @@ d () {
if [[ $TRAVIS ]]; then
# Workaround Travis-CI intermittent network I/O error
while (! d pull "urho3d/dockerized$BuildEnvironment:$DBE_TAG"); do sleep 10; done;
while (! d pull "${registry}urho3d/dockerized$BuildEnvironment:$DBE_TAG"); do sleep 10; done;
elif [[ $DBE_REFRESH == 1 ]]; then
d pull "urho3d/dockerized$BuildEnvironment:$DBE_TAG"
d pull "${registry}urho3d/dockerized$BuildEnvironment:$DBE_TAG"
fi
if [[ $use_podman ]] || ( [[ $(d version -f '{{.Client.Version}}') =~ ^([0-9]+)\.0*([0-9]+)\. ]] && (( BASH_REMATCH[1] * 100 + BASH_REMATCH[2] >= 1809 )) ); then
@ -69,7 +71,7 @@ if [[ $use_podman ]] || ( [[ $(d version -f '{{.Client.Version}}') =~ ^([0-9]+)\
--env-file "$PROJECT_DIR/script/.env-file" \
--mount type=bind,source="$PROJECT_DIR",target="$PROJECT_DIR" \
--mount type=volume,source="$(id -u).urho3d_home_dir",target=/home/urho3d$mount_option \
"urho3d/dockerized$BuildEnvironment:$DBE_TAG" "$@"
"${registry}urho3d/dockerized$BuildEnvironment:$DBE_TAG" "$@"
else
# Fallback workaround on older Docker CLI version
d run -it --rm -h fishtank \