From 389e0bad20bd6567fef5f76e6e4d4af5cc701f59 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 25 Mar 2022 00:50:11 +0100 Subject: [PATCH] Fix tests --- tests/base/01-test-env-entrypoint.sh | 7 ++++--- tests/base/02-test-env-uid.sh | 7 ++++--- tests/base/03-test-env-gid.sh | 7 ++++--- tests/base/04-test-run_nginx.sh | 3 ++- tests/base/06-test-apt-repositories.sh | 3 ++- tests/mods/01-test-modules.sh | 3 ++- tests/mods/modules.sh | 5 +++-- tests/prod/01-test-env-timezone.sh | 3 ++- tests/prod/02-test-env-docker_logs-stdout.sh | 3 ++- tests/prod/03-test-env-docker_logs-file.sh | 3 ++- tests/prod/04-test-env-enable_mail.sh | 3 ++- .../05-test-env-forward_ports_to_localhost.sh | 3 ++- tests/prod/06-test-mount-custom_ini.sh | 3 ++- tests/prod/07-test-mount-custom_fpm_conf.sh | 3 ++- tests/prod/08-test-custom-user-scripts-1.sh | 3 ++- tests/prod/09-test-custom-user-scripts-2.sh | 3 ++- tests/test.sh | 17 +++++++++-------- tests/work/01-test-env-mysqldump-secure.sh | 3 ++- 18 files changed, 50 insertions(+), 32 deletions(-) diff --git a/tests/base/01-test-env-entrypoint.sh b/tests/base/01-test-env-entrypoint.sh index 91c8ffe..da4734e 100755 --- a/tests/base/01-test-env-entrypoint.sh +++ b/tests/base/01-test-env-entrypoint.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -24,7 +25,7 @@ FLAVOUR="${4}" ### Debug == 0 ### print_h2 "DEBUG_ENTRYPOINT=0" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=0" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=0" )"; then exit 1 fi @@ -58,7 +59,7 @@ docker_stop "${name}" ### Debug == 1 ### print_h2 "DEBUG_ENTRYPOINT=1" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=1" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=1" )"; then exit 1 fi @@ -98,7 +99,7 @@ docker_stop "${name}" ### Debug == 2 ### print_h2 "DEBUG_ENTRYPOINT=2" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then exit 1 fi diff --git a/tests/base/02-test-env-uid.sh b/tests/base/02-test-env-uid.sh index a36fc96..e04300d 100755 --- a/tests/base/02-test-env-uid.sh +++ b/tests/base/02-test-env-uid.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -24,7 +25,7 @@ FLAVOUR="${4}" ### uid: 1005 (new uid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=1005" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1005" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1005" )"; then exit 1 fi @@ -58,7 +59,7 @@ docker_stop "${name}" ### uid: 1000 (same uid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=1000" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1000" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1000" )"; then exit 1 fi @@ -92,7 +93,7 @@ docker_stop "${name}" ### uid: 33 (existing uid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_UID=33" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=33" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=33" )"; then exit 1 fi diff --git a/tests/base/03-test-env-gid.sh b/tests/base/03-test-env-gid.sh index 771a3da..54af76e 100755 --- a/tests/base/03-test-env-gid.sh +++ b/tests/base/03-test-env-gid.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -24,7 +25,7 @@ FLAVOUR="${4}" ### gid: 1005 (new gid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=1005" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1005" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1005" )"; then exit 1 fi @@ -58,7 +59,7 @@ docker_stop "${name}" ### gid: 1000 (same gid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=1000" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1000" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=1000" )"; then exit 1 fi @@ -92,7 +93,7 @@ docker_stop "${name}" ### gid: 33 (existing gid) ### print_h2 "DEBUG_ENTRYPOINT=2 NEW_GID=33" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=33" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_GID=33" )"; then exit 1 fi diff --git a/tests/base/04-test-run_nginx.sh b/tests/base/04-test-run_nginx.sh index 51451d9..3f07e9c 100755 --- a/tests/base/04-test-run_nginx.sh +++ b/tests/base/04-test-run_nginx.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -45,7 +46,7 @@ run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done" # Start PHP-FPM print_h2 "Starting PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"; then exit 1 fi diff --git a/tests/base/06-test-apt-repositories.sh b/tests/base/06-test-apt-repositories.sh index fc34d10..9d4c4cc 100755 --- a/tests/base/06-test-apt-repositories.sh +++ b/tests/base/06-test-apt-repositories.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -24,7 +25,7 @@ FLAVOUR="${4}" ### Ensuring 'apt update' works without any issues ### print_h2 "Ensure 'apt update' works" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2" )"; then exit 1 fi diff --git a/tests/mods/01-test-modules.sh b/tests/mods/01-test-modules.sh index 1f916b9..39d5709 100755 --- a/tests/mods/01-test-modules.sh +++ b/tests/mods/01-test-modules.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 @@ -22,7 +23,7 @@ FLAVOUR="${4}" ERROR=0 for dir in $( ls -1 "${CWD}/modules/" ); do - if ! "${CWD}/modules.sh" "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${dir}"; then + if ! "${CWD}/modules.sh" "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" "${dir}"; then ERROR="$(( ERROR + 1 ))" fi done diff --git a/tests/mods/modules.sh b/tests/mods/modules.sh index 7161e7e..551af7e 100755 --- a/tests/mods/modules.sh +++ b/tests/mods/modules.sh @@ -15,7 +15,8 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" -MODULE="${5}" +TAG="${5}" +MODULE="${6}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -55,7 +56,7 @@ docker run \ -v "${CWD}/modules/${MODULE}:${WORKDIR}" \ --entrypoint=sh \ --workdir="${WORKDIR}" \ - "${IMAGE}:${VERSION}-${FLAVOUR}" \ + "${IMAGE}:${TAG}" \ -c 'find . -name "*.php" -type f -print0 | xargs -0 -n1 sh -c " set -e set -u diff --git a/tests/prod/01-test-env-timezone.sh b/tests/prod/01-test-env-timezone.sh index 70ef077..242d24c 100755 --- a/tests/prod/01-test-env-timezone.sh +++ b/tests/prod/01-test-env-timezone.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -24,7 +25,7 @@ FLAVOUR="${4}" ### Europe/Berlin ### print_h2 "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e TIMEZONE=Europe/Berlin" )"; then exit 1 fi diff --git a/tests/prod/02-test-env-docker_logs-stdout.sh b/tests/prod/02-test-env-docker_logs-stdout.sh index 5ab74e0..004128f 100755 --- a/tests/prod/02-test-env-docker_logs-stdout.sh +++ b/tests/prod/02-test-env-docker_logs-stdout.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -51,7 +52,7 @@ run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done" # Start PHP-FPM print_h2 "Starting PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=1 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=1 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then exit 1 fi diff --git a/tests/prod/03-test-env-docker_logs-file.sh b/tests/prod/03-test-env-docker_logs-file.sh index 149abaa..d144008 100755 --- a/tests/prod/03-test-env-docker_logs-file.sh +++ b/tests/prod/03-test-env-docker_logs-file.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -51,7 +52,7 @@ run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done" # Start PHP-FPM print_h2 "Starting PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=0 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e DOCKER_LOGS=0 -v ${WWW_DIR_HOST}:${WWW_DIR_CONT} -v ${LOG_DIR_HOST}:/var/log/php" )"; then exit 1 fi diff --git a/tests/prod/04-test-env-enable_mail.sh b/tests/prod/04-test-env-enable_mail.sh index 20912b0..652e43c 100755 --- a/tests/prod/04-test-env-enable_mail.sh +++ b/tests/prod/04-test-env-enable_mail.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -26,7 +27,7 @@ FLAVOUR="${4}" MOUNTPOINT="$( mktemp --directory )" print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" )"; then exit 1 fi diff --git a/tests/prod/05-test-env-forward_ports_to_localhost.sh b/tests/prod/05-test-env-forward_ports_to_localhost.sh index 8967109..26394d4 100755 --- a/tests/prod/05-test-env-forward_ports_to_localhost.sh +++ b/tests/prod/05-test-env-forward_ports_to_localhost.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -39,7 +40,7 @@ run "sleep 60" # Start PHP-FPM print_h2 "Start PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 --link ${name_mysql}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 --link ${name_mysql}" )"; then docker_stop "${name_mysql}" || true exit 1 fi diff --git a/tests/prod/06-test-mount-custom_ini.sh b/tests/prod/06-test-mount-custom_ini.sh index b3e3696..12c7285 100755 --- a/tests/prod/06-test-mount-custom_ini.sh +++ b/tests/prod/06-test-mount-custom_ini.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -51,7 +52,7 @@ run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done" # Start PHP-FPM print_h2 "Starting PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-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}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-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}" )"; then exit 1 fi diff --git a/tests/prod/07-test-mount-custom_fpm_conf.sh b/tests/prod/07-test-mount-custom_fpm_conf.sh index b9a18a4..25c469d 100755 --- a/tests/prod/07-test-mount-custom_fpm_conf.sh +++ b/tests/prod/07-test-mount-custom_fpm_conf.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -55,7 +56,7 @@ run "until docker pull --platform ${ARCH} ${CONTAINER}; do sleep 1; done" # Start PHP-FPM print_h2 "Starting PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-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}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-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}" )"; then exit 1 fi diff --git a/tests/prod/08-test-custom-user-scripts-1.sh b/tests/prod/08-test-custom-user-scripts-1.sh index 9a1d112..511ca62 100755 --- a/tests/prod/08-test-custom-user-scripts-1.sh +++ b/tests/prod/08-test-custom-user-scripts-1.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -35,7 +36,7 @@ chmod +x "${RUN_SH_HOST}/myscript1.sh" # Start PHP-FPM print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then exit 1 fi diff --git a/tests/prod/09-test-custom-user-scripts-2.sh b/tests/prod/09-test-custom-user-scripts-2.sh index 6c9aebd..610410a 100755 --- a/tests/prod/09-test-custom-user-scripts-2.sh +++ b/tests/prod/09-test-custom-user-scripts-2.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -35,7 +36,7 @@ chmod +x "${RUN_SH_HOST}/myscript1.sh" # Start PHP-FPM print_h2 "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"; then exit 1 fi diff --git a/tests/test.sh b/tests/test.sh index 43e5c09..c324b2f 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -39,6 +39,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" ### @@ -49,9 +50,9 @@ if [ "${FLAVOUR}" = "base" ] || [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "p for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH})" - printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR}" + printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" + time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" done fi @@ -60,9 +61,9 @@ if [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "w for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH})" - printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR}" + printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" + time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" done fi @@ -71,9 +72,9 @@ if [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH})" - printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR}" + printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" + time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" done fi @@ -82,8 +83,8 @@ if [ "${FLAVOUR}" = "work" ]; then for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH})" - printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR}" + printf "\033[0;33m%s %s\033[0m\n" "#" "${t} ${IMAGE} ${ARCH} ${VERSION} ${FLAVOUR} ${TAG}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" + time ${t} "${IMAGE}" "${ARCH}" "${VERSION}" "${FLAVOUR}" "${TAG}" done fi diff --git a/tests/work/01-test-env-mysqldump-secure.sh b/tests/work/01-test-env-mysqldump-secure.sh index b7e449d..78a3827 100755 --- a/tests/work/01-test-env-mysqldump-secure.sh +++ b/tests/work/01-test-env-mysqldump-secure.sh @@ -10,6 +10,7 @@ IMAGE="${1}" ARCH="${2}" VERSION="${3}" FLAVOUR="${4}" +TAG="${5}" # shellcheck disable=SC1090 . "${CWD}/../.lib.sh" @@ -40,7 +41,7 @@ run "sleep 60" # Start PHP-FPM container print_h2 "Start PHP-FPM" -if ! name="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 -e MYSQL_BACKUP_USER=root -e MYSQL_BACKUP_PASS=${MYSQL_ROOT_PASSWORD} -e MYSQL_BACKUP_HOST=127.0.0.1 -v ${MOUNTPOINT}:/shared/backups --link ${name_mysql}" )"; then +if ! name="$( docker_run "${IMAGE}:${TAG}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e FORWARD_PORTS_TO_LOCALHOST=3306:${name_mysql}:3306 -e MYSQL_BACKUP_USER=root -e MYSQL_BACKUP_PASS=${MYSQL_ROOT_PASSWORD} -e MYSQL_BACKUP_HOST=127.0.0.1 -v ${MOUNTPOINT}:/shared/backups --link ${name_mysql}" )"; then docker_stop "${name_mysql}" || true exit 1 fi