mirror of
https://github.com/devilbox/docker-php-fpm.git
synced 2026-01-10 18:04:43 +00:00
Fix base/ tests
This commit is contained in:
@@ -23,58 +23,64 @@ FLAVOUR="${4}"
|
||||
###
|
||||
### uid: 1005 (new uid)
|
||||
###
|
||||
did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1005" )"
|
||||
|
||||
if ! run "docker logs ${did} 2>&1 | grep -q '1005'"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
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
|
||||
exit 1
|
||||
fi
|
||||
if ! run "docker logs ${name} 2>&1 | grep -q '1005'"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
if ! docker_exec "${did}" "id | grep 'uid=1005'" "--user=devilbox"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
if ! docker_exec "${name}" "id | grep 'uid=1005'" "--user=devilbox"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
docker_stop "${did}"
|
||||
docker_stop "${name}"
|
||||
|
||||
|
||||
###
|
||||
### uid: 1000 (same uid)
|
||||
###
|
||||
did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=1000" )"
|
||||
|
||||
if ! run "docker logs ${did} 2>&1 | grep -q '1000'"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
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
|
||||
exit 1
|
||||
fi
|
||||
if ! run "docker logs ${name} 2>&1 | grep -q '1000'"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
if ! docker_exec "${did}" "id | grep 'uid=1000'" "--user=devilbox"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
if ! docker_exec "${name}" "id | grep 'uid=1000'" "--user=devilbox"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
docker_stop "${did}"
|
||||
docker_stop "${name}"
|
||||
|
||||
|
||||
###
|
||||
### uid: 33 (existing uid)
|
||||
###
|
||||
did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "${ARCH}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=33" )"
|
||||
|
||||
if ! run "docker logs ${did} 2>&1 | grep -q '33'"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
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
|
||||
exit 1
|
||||
fi
|
||||
if ! run "docker logs ${name} 2>&1 | grep -q '33'"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
if ! docker_exec "${did}" "id | grep 'uid=33'" "--user=devilbox"; then
|
||||
docker_logs "${did}" || true
|
||||
docker_stop "${did}" || true
|
||||
if ! docker_exec "${name}" "id | grep 'uid=33'" "--user=devilbox"; then
|
||||
docker_logs "${name}" || true
|
||||
docker_stop "${name}" || true
|
||||
echo "Failed"
|
||||
exit 1
|
||||
fi
|
||||
docker_stop "${did}"
|
||||
docker_stop "${name}"
|
||||
|
||||
Reference in New Issue
Block a user