gnuviech/dockerfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use PHP 7.4 for bullseye

Browse source
This commit is contained in:
Jan Dittberner 2020-10-31 18:06:14 +01:00
parent e8cf9df18b
commit 39ba0e660a
5 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bullseye_php7/Dockerfile
View file

@ -1,7 +1,7 @@
FROM gnuviech/bullseye_php7-base:latest FROM gnuviech/bullseye_php7-base:latest
LABEL maintainer="jan@dittberner.info" LABEL maintainer="jan@dittberner.info"
RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc COPY fpm-pool.conf.tmpl /usr/local/etc

24
bullseye_php7/Dockerfile-base
View file

@ -8,20 +8,22 @@ RUN apt-get update \
dumb-init \ dumb-init \
libnss-ldap \ libnss-ldap \
nullmailer \ nullmailer \
php-curl \
php-fpm \
php-gd \
php-imagick \
php-imap \
php-json \
php-mail \
php-mail-mime \ php-mail-mime \
php-mbstring \
php-net-smtp \ php-net-smtp \
php-net-socket \ php-net-socket \
php-opcache \ php-mail \
php-pspell \ php7.4 \
php-sqlite3 \ php7.4-curl \
php7.4-fpm \
php7.4-fpm \
php7.4-gd \
php7.4-imagick \
php7.4-imap \
php7.4-json \
php7.4-mbstring \
php7.4-opcache \
php7.4-pspell \
php7.4-sqlite3 \
psmisc \ psmisc \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*

4
bullseye_php7/Dockerfile-mysql
View file

@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
RUN apt-get update \ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \ && DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
php-mysql \ php7.4-mysql \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*
RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc COPY fpm-pool.conf.tmpl /usr/local/etc

4
bullseye_php7/Dockerfile-pgsql
View file

@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
RUN apt-get update \ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \ && DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
php-mysql \ php7.4-pgsql \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*
RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc COPY fpm-pool.conf.tmpl /usr/local/etc

4
bullseye_php7/start-fpm.sh
View file

@ -4,8 +4,8 @@ set -e
sed "s/@user@/${FPM_USER}/g; s/@variant@/${FPM_VARIANT}/g" \ sed "s/@user@/${FPM_USER}/g; s/@variant@/${FPM_VARIANT}/g" \
< /usr/local/etc/fpm-pool.conf.tmpl \ < /usr/local/etc/fpm-pool.conf.tmpl \
> "/etc/php/7.3/fpm/pool.d/${FPM_USER}.conf" > "/etc/php/7.4/fpm/pool.d/${FPM_USER}.conf"
/etc/init.d/nullmailer start /etc/init.d/nullmailer start
mkdir -p /run/php mkdir -p /run/php
/usr/sbin/php-fpm7.3 --nodaemonize /usr/sbin/php-fpm7.4 --nodaemonize