mirror of
https://github.com/devilbox/docker-php-fpm.git
synced 2026-01-10 01:51:14 +00:00
Fix tests
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user