Fix: Repeat docker pull until success

devilbox · Jan 11, 2019 · 847ea4e · 847ea4e
1 parent 1be3fa7
commit 847ea4e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/base/04-test-run_nginx.sh b/tests/base/04-test-run_nginx.sh
@@ -38,7 +38,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull Image
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"

diff --git a/tests/prod/05-test-env-forward_ports_to_localhost.sh b/tests/prod/05-test-env-forward_ports_to_localhost.sh
@@ -25,7 +25,7 @@ FLAVOUR="${3}"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )"

diff --git a/tests/prod/06-test-mount-custom_ini.sh b/tests/prod/06-test-mount-custom_ini.sh
@@ -44,7 +44,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )"

diff --git a/tests/prod/07-test-mount-custom_fpm_conf.sh b/tests/prod/07-test-mount-custom_fpm_conf.sh
@@ -49,7 +49,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )"

diff --git a/tests/work/01-test-env-mysqldump-secure.sh b/tests/work/01-test-env-mysqldump-secure.sh
@@ -27,7 +27,7 @@ MOUNTPOINT="$( mktemp --directory )"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )"