nune/privatebin-docker-nginx-fpm-alpine
nune/privatebin-docker-nginx-fpm-alpine
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

upgrade to PHP 8

Browse source
This commit is contained in:
El RIDO 2021-01-16 06:23:37 +01:00
parent 3892bc3573
commit 798992cb0e
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -10,11 +10,11 @@ ENV S6_READ_ONLY_ROOT 1
RUN \ RUN \
# Install dependencies # Install dependencies
apk add --no-cache gnupg nginx php7-fpm php7-json php7-gd \ apk add --no-cache gnupg nginx php8-fpm php8-json php8-gd \
php7-opcache php7-pdo_mysql php7-pdo_pgsql tzdata \ php8-opcache php8-pdo_mysql php8-pdo_pgsql tzdata \
&& apk upgrade --no-cache \ && apk upgrade --no-cache \
# Remove (some of the) default nginx config # Remove (some of the) default nginx config
&& rm -f /etc/nginx.conf /etc/nginx/conf.d/default.conf /etc/php7/php-fpm.d/www.conf \ && rm -f /etc/nginx.conf /etc/nginx/conf.d/default.conf /etc/php8/php-fpm.d/www.conf \
&& rm -rf /etc/nginx/sites-* \ && rm -rf /etc/nginx/sites-* \
# Ensure nginx logs, even if the config has errors, are written to stderr # Ensure nginx logs, even if the config has errors, are written to stderr
&& ln -s /dev/stderr /var/log/nginx/error.log \ && ln -s /dev/stderr /var/log/nginx/error.log \
@ -46,10 +46,10 @@ RUN \
&& gpg2 --verify s6-overlay-${S6ARCH}.tar.gz.sig \ && gpg2 --verify s6-overlay-${S6ARCH}.tar.gz.sig \
&& tar -xzf s6-overlay-${S6ARCH}.tar.gz -C / \ && tar -xzf s6-overlay-${S6ARCH}.tar.gz -C / \
# Support running s6 under a non-root user # Support running s6 under a non-root user
&& mkdir -p /etc/services.d/nginx/supervise /etc/services.d/php-fpm7/supervise \ && mkdir -p /etc/services.d/nginx/supervise /etc/services.d/php-fpm8/supervise \
&& mkfifo \ && mkfifo \
/etc/services.d/nginx/supervise/control \ /etc/services.d/nginx/supervise/control \
/etc/services.d/php-fpm7/supervise/control \ /etc/services.d/php-fpm8/supervise/control \
&& adduser nobody www-data \ && adduser nobody www-data \
&& chown -R nobody.www-data /etc/services.d /etc/s6 /run /srv/* /var/lib/nginx /var/www \ && chown -R nobody.www-data /etc/services.d /etc/s6 /run /srv/* /var/lib/nginx /var/www \
# Clean up # Clean up

0
etc/php7/conf.d/00-docker.ini → etc/php8/conf.d/00-docker.ini
View file

1
etc/php7/php-fpm.d/zz-docker.conf → etc/php8/php-fpm.d/zz-docker.conf
View file

@ -1,5 +1,4 @@
[global] [global]
pid = /run/php-fpm7.pid
daemonize = no daemonize = no
error_log = /dev/stderr error_log = /dev/stderr

2
etc/services.d/php-fpm7/run → etc/services.d/php-fpm8/run
View file

@ -1,2 +1,2 @@
#!/usr/bin/execlineb -P #!/usr/bin/execlineb -P
/usr/sbin/php-fpm7 /usr/sbin/php-fpm8