diff --git a/tests/base/04-test-run_nginx.sh b/tests/base/04-test-run_nginx.sh index 9ee69dd..a2a0ab8 100755 --- a/tests/base/04-test-run_nginx.sh +++ b/tests/base/04-test-run_nginx.sh @@ -29,9 +29,14 @@ DOC_ROOT_CONT="/var/www/default" CONFIG_HOST="$( mktemp -d )" CONFIG_CONT="/etc/nginx/conf.d" +CONTAINER="nginx:stable" + FINDME="am_i_really_working" echo "${FINDME}" > "${DOC_ROOT_HOST}/index.php" +# Pull Image +run "docker pull ${CONTAINER}" + # Start PHP-FPM did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )" name="$( docker_name "${did}" )" @@ -54,7 +59,7 @@ name="$( docker_name "${did}" )" } > "${CONFIG_HOST}/php.conf" # Start Nginx -ndid="$( docker_run "nginx:stable" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )" +ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )" # Check PHP connectivity if ! run "curl -q 127.0.0.1:${WWW_PORT}/index.php 2>&1 | grep '${FINDME}'"; then diff --git a/tests/prod/04-test-env-forward_ports_to_localhost.sh b/tests/prod/04-test-env-forward_ports_to_localhost.sh index 6662a3f..ffb3746 100755 --- a/tests/prod/04-test-env-forward_ports_to_localhost.sh +++ b/tests/prod/04-test-env-forward_ports_to_localhost.sh @@ -22,9 +22,13 @@ FLAVOUR="${3}" ### ### Socat forwarding ### +CONTAINER="mysql:5.6" + +# Pull Container +run "docker pull ${CONTAINER}" # Start mysql container -mdid="$( docker_run "mysql:5.6" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )" +mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )" mname="$( docker_name "${mdid}" )" run "sleep 5" @@ -40,8 +44,8 @@ fi # Test connectivity docker_exec "${did}" "ping -c 1 ${mname}" -#docker_exec "${did}" "echo | nc -w 1 ${mname} 3306" -#docker_exec "${did}" "echo | nc -w 1 127.0.0.1 3306" +docker_exec "${did}" "echo | nc -w 1 ${mname} 3306" +docker_exec "${did}" "echo | nc -w 1 127.0.0.1 3306" # Only work container has mysql binary installed if [ "${FLAVOUR}" = "work" ]; then diff --git a/tests/prod/05-test-mount-custom_ini.sh b/tests/prod/05-test-mount-custom_ini.sh index 98cad5a..881684b 100755 --- a/tests/prod/05-test-mount-custom_ini.sh +++ b/tests/prod/05-test-mount-custom_ini.sh @@ -32,9 +32,13 @@ CONFIG_CONT="/etc/nginx/conf.d" PHP_INI_HOST="$( mktemp -d )" PHP_INI_CONT="/etc/php-custom.d" +CONTAINER="nginx:stable" + echo "post_max_size = 17M" > "${PHP_INI_HOST}/post.ini" echo " "${DOC_ROOT_HOST}/index.php" +# Pull container +run "docker pull ${CONTAINER}" # Start PHP-FPM did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )" @@ -59,7 +63,7 @@ name="$( docker_name "${did}" )" # Start Nginx -ndid="$( docker_run "nginx:stable" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )" +ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CONFIG_HOST}:${CONFIG_CONT} -p ${WWW_PORT}:80 --link ${name}" )" # Check entrypoint if ! run "docker logs ${did} | grep 'post.ini'"; then diff --git a/tests/work/01-test-env-mysqldump-secure.sh b/tests/work/01-test-env-mysqldump-secure.sh index a801a5d..ef76aa6 100755 --- a/tests/work/01-test-env-mysqldump-secure.sh +++ b/tests/work/01-test-env-mysqldump-secure.sh @@ -24,9 +24,13 @@ FLAVOUR="${3}" ### MYSQL_ROOT_PASSWORD="toor" MOUNTPOINT="$( mktemp --directory )" +CONTAINER="mysql:5.6" + +# Pull Container +run "docker pull ${CONTAINER}" # Start mysql container -mdid="$( docker_run "mysql:5.6" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )" +mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )" mname="$( docker_name "${mdid}" )" run "sleep 5"