From f09e82607bb3be3f55d7296c0a187ee8c6a72660 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Mon, 17 Aug 2020 12:05:18 +0100 Subject: [PATCH 1/2] fixes to composer run user --- scripts/start.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 13e3dab..f29ba6d 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -212,14 +212,15 @@ if [[ "$RUN_SCRIPTS" == "1" ]] ; then fi if [ -z "$SKIP_COMPOSER" ]; then + # Allow nginx user to call composer closes #169 # Try auto install for composer if [ -f "/var/www/html/composer.lock" ]; then if [ "$APPLICATION_ENV" == "development" ]; then - composer global require hirak/prestissimo - composer install --working-dir=/var/www/html + su - nginx -c 'composer global require hirak/prestissimo' + su - nginx -c 'composer install --working-dir=/var/www/html' else - composer global require hirak/prestissimo - composer install --no-dev --working-dir=/var/www/html + su - nginx -c 'composer global require hirak/prestissimo' + su - nginx -c 'composer install --no-dev --working-dir=/var/www/html' fi fi fi From cef53405ca4259f919abefda0a96b64e39abd803 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Mon, 17 Aug 2020 12:07:43 +0100 Subject: [PATCH 2/2] update docs --- README.md | 2 +- docs/versioning.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3002e3..caee513 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you have improvements or suggestions please open an issue or pull request on ### Versioning | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest/1.10.2 | Master Branch |1.18.0 | 7.4.9 | 3.12 | +| latest/1.10.3 | Master Branch |1.18.0 | 7.4.9 | 3.12 | _Note:_ The image is now aviable on x86_64 and Arm systems! diff --git a/docs/versioning.md b/docs/versioning.md index 9df9839..18de4fe 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -22,6 +22,7 @@ The latest tag will always follow the master branch in git. the other versions w | 1.10.0 | 7.4.8 |1.18.0 | 3.12 | 0.3.13 | PHP 7.4.8 + Nginx 1.18.0 + arm builds | | 1.10.1 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | bump to PHP 7.4.9 | | 1.10.2 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | Swap Docker file from ADD to COPY | +| 1.10.3 | 7.4.9 |1.18.0 | 3.12 | 0.3.14 | run composer as non root user | These tags will be created on GitLab and as tags in docker hub.