Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.11.0 #871

Merged
merged 19 commits into from
Mar 22, 2022
Merged

Release/v1.11.0 #871

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4e10d85
Make MariaDB 10.6 the default
cytopia Mar 16, 2022
1bb408f
Make PHP 8.1 the default
cytopia Mar 18, 2022
81d2f7d
Fixes #844 Allow to globally enable/disable HTTP/2
cytopia Mar 18, 2022
ace31c8
Fixes #854 pidof issue for rsyslog on arm64
cytopia Mar 18, 2022
4945ca2
Update README
cytopia Mar 18, 2022
d6337cc
#844 Update docs for HTTP/2 settings
cytopia Mar 18, 2022
6a98ee4
Update project files
cytopia Mar 18, 2022
218ed79
Fixed array definition for PHP < 5.4
cytopia Mar 18, 2022
d4b0be9
Be more verbose during test startup
cytopia Mar 18, 2022
c87f18f
Update PHP-FPM images
cytopia Mar 22, 2022
7f3d37e
Updated bind image
cytopia Mar 22, 2022
eadafcf
Updated project files
cytopia Mar 22, 2022
39aae05
Add MariaDB 10.8 to CI tests
cytopia Mar 22, 2022
5804546
Fix shellcheck errors for CI tests
cytopia Mar 22, 2022
91da7d3
Refs #837 Update phpmyadmin to 5.1.3
cytopia Mar 22, 2022
8666ca6
Fix CI test output for Adminer Mongo
cytopia Mar 22, 2022
fe3c90f
Fixes #867 Adminer 4.8.1 CSS issues
cytopia Mar 22, 2022
708253e
Add support section
cytopia Mar 22, 2022
907d679
Re-enable testing wordpress for PHP 8.0 and PHP 8.1
cytopia Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Be more verbose during test startup
  • Loading branch information
@cytopia
cytopia committed Mar 18, 2022
commit d4b0be9ac4df5856ef5ed5e4ba567dd33188be89
23 changes: 20 additions & 3 deletions .tests/scripts/compose-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ fi
###
HOST_PORT_HTTPD="$( "${SCRIPT_PATH}/env-getvar.sh" "HOST_PORT_HTTPD" )"
MYSQL_ROOT_PASSWORD="$( "${SCRIPT_PATH}/env-getvar.sh" "MYSQL_ROOT_PASSWORD" )"
PHP_SERVER="$( "${SCRIPT_PATH}/env-getvar.sh" "PHP_SERVER" )"
HTTPD_SERVER="$( "${SCRIPT_PATH}/env-getvar.sh" "HTTPD_SERVER" )"


###
Expand Down Expand Up @@ -62,6 +64,9 @@ until curl -sS -I --fail -o /dev/null -w "%{http_code}" "http://localhost:${HOST
run "docker-compose exec -T --user devilbox php curl -sS -v 'http://localhost/'" "1" "${DVLBOX_PATH}" || true
run "docker-compose exec -T --user devilbox php curl -sS -I 'http://localhost/'" "1" "${DVLBOX_PATH}" || true
run "docker-compose exec -T --user devilbox php curl -sS -I -o /dev/null -w '%{http_code}' 'http://localhost/'" "1" "${DVLBOX_PATH}" || true
run "cd ${DVLBOX_PATH} && docker-compose logs" || true
run "cat ${DVLBOX_PATH}/log/php-fpm-${PHP_SERVER}/php-fpm.error" || true
run "cat ${DVLBOX_PATH}/log/${HTTPD_SERVER}/defaultlocalhost-error.log" || true
exit 1
fi

Expand All @@ -83,6 +88,9 @@ until curl -sS --fail "http://localhost:${HOST_PORT_HTTPD}" 2>/dev/null | grep '
printf "[FAIL]\\n"
curl -sS -v "http://localhost:${HOST_PORT_HTTPD}"
curl -sS -I "http://localhost:${HOST_PORT_HTTPD}"
run "cd ${DVLBOX_PATH} && docker-compose logs" || true
run "cat ${DVLBOX_PATH}/log/php-fpm-${PHP_SERVER}/php-fpm.error" || true
run "cat ${DVLBOX_PATH}/log/${HTTPD_SERVER}/defaultlocalhost-error.log" || true
exit 1
fi

Expand Down Expand Up @@ -114,7 +122,10 @@ until cd "${DVLBOX_PATH}" && docker-compose exec -T php mongofiles --host=mongo
i=$(( i + 1 ))
if [ "${i}" -eq "60" ]; then
printf "[FAIL]\\n"
cd "${DVLBOX_PATH}" && docker-compose exec -T php mongofiles --host=mongo list
cd "${DVLBOX_PATH}" && docker-compose exec -T php mongofiles --host=mongo list || true
run "cd ${DVLBOX_PATH} && docker-compose logs" || true
run "cat ${DVLBOX_PATH}/log/php-fpm-${PHP_SERVER}/php-fpm.error" || true
run "cat ${DVLBOX_PATH}/log/${HTTPD_SERVER}/defaultlocalhost-error.log" || true
exit 1
fi

Expand All @@ -134,7 +145,10 @@ until cd "${DVLBOX_PATH}" && docker-compose exec -T php mysql --user=root --pass
i=$(( i + 1 ))
if [ "${i}" -eq "60" ]; then
printf "[FAIL]\\n"
cd "${DVLBOX_PATH}" && docker-compose exec -T php mysql --user=root --password="${MYSQL_ROOT_PASSWORD}" --host=mysql -e 'show databases;'
cd "${DVLBOX_PATH}" && docker-compose exec -T php mysql --user=root --password="${MYSQL_ROOT_PASSWORD}" --host=mysql -e 'show databases;' || true
run "cd ${DVLBOX_PATH} && docker-compose logs" || true
run "cat ${DVLBOX_PATH}/log/php-fpm-${PHP_SERVER}/php-fpm.error" || true
run "cat ${DVLBOX_PATH}/log/${HTTPD_SERVER}/defaultlocalhost-error.log" || true
exit 1
fi

Expand All @@ -154,7 +168,10 @@ until cd "${DVLBOX_PATH}" && docker-compose exec -T php pg_isready --host=pgsql
i=$(( i + 1 ))
if [ "${i}" -eq "60" ]; then
printf "[FAIL]\\n"
cd "${DVLBOX_PATH}" && docker-compose exec -T php pg_isready --host=pgsql
cd "${DVLBOX_PATH}" && docker-compose exec -T php pg_isready --host=pgsql || true
run "cd ${DVLBOX_PATH} && docker-compose logs" || true
run "cat ${DVLBOX_PATH}/log/php-fpm-${PHP_SERVER}/php-fpm.error" || true
run "cat ${DVLBOX_PATH}/log/${HTTPD_SERVER}/defaultlocalhost-error.log" || true
exit 1
fi

Expand Down