rebase to alpine 3.12, bump php uploads

This commit is contained in:
aptalca 2020-09-17 16:19:51 -04:00
parent a7309cad9e
commit 8af8464d49
6 changed files with 9 additions and 3 deletions

View File

@ -1,4 +1,4 @@
FROM lsiobase/nginx:3.11
FROM lsiobase/nginx:3.12
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM lsiobase/nginx:arm64v8-3.11
FROM lsiobase/nginx:arm64v8-3.12
# set version label
ARG BUILD_DATE

View File

@ -1,4 +1,4 @@
FROM lsiobase/nginx:arm32v7-3.11
FROM lsiobase/nginx:arm32v7-3.12
# set version label
ARG BUILD_DATE

View File

@ -265,6 +265,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default.
* **19.12.19:** - Rebasing to alpine 3.11.
* **26.07.19:** - Use old version of tidyhtml pending upstream fixes.
* **28.06.19:** - Rebasing to alpine 3.10.

View File

@ -100,6 +100,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
- { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." }
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }

View File

@ -60,6 +60,10 @@ fi
# set appurl if detected
[ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env
## Bump php upload max filesize and post max size to 100MB by default
grep -qxF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini
grep -qxF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini
# check for the mysql endpoint for 30 seconds
END=$((SECONDS+30))
while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do