Skip to content

Update PHP image #60

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

Merged
merged 3 commits into from
Nov 19, 2018
Merged

Update PHP image #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df3a57a
Remove unnecessary user and group changes
mrrobot47 Nov 16, 2018
22c2cc7
Add ping, status path and updated timeout value
mrrobot47 Nov 19, 2018
c08ac9d
Update to production ini
mrrobot47 Nov 19, 2018
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
3 changes: 2 additions & 1 deletion php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ RUN echo "mailhub=postfix\nUseTLS=NO\nFromLineOverride=YES" > /etc/ssmtp/ssmtp.c
# Setup logs
RUN mkdir -p /var/log/php; \
chown -R www-data: /var/log/php; \
rm /usr/local/etc/php-fpm.d/*;
rm /usr/local/etc/php-fpm.d/*; \
mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
COPY easyengine.conf /usr/local/etc/php-fpm.d/easyengine.conf

COPY expose_off.ini /usr/local/etc/php/conf.d/expose_off.ini
Expand Down
10 changes: 0 additions & 10 deletions php/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
#!/bin/bash
set -euo pipefail

U_ID=${USER_ID}
G_ID=${GROUP_ID}

wwwdata_uid=$(id -u www-data)
if [[ "$U_ID" -ne 0 && "$wwwdata_uid" -ne $U_ID ]];then
usermod -u $U_ID www-data
groupmod -g $G_ID www-data
chown -R www-data:www-data /var/
fi

exec "$@"
3 changes: 3 additions & 0 deletions php/easyengine.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ error_log = /var/log/php/error.log
daemonize = no

[www]
ping.path = /ee-admin/ping
pm.status_path = /ee-admin/status
request_terminate_timeout = 300
user = www-data
group = www-data
pm = ondemand
Expand Down