Use PHP 7.4 for bullseye
This commit is contained in:
parent
e8cf9df18b
commit
39ba0e660a
5 changed files with 20 additions and 18 deletions
|
@ -1,7 +1,7 @@
|
|||
FROM gnuviech/bullseye_php7-base:latest
|
||||
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 fpm-pool.conf.tmpl /usr/local/etc
|
||||
|
|
|
@ -8,20 +8,22 @@ RUN apt-get update \
|
|||
dumb-init \
|
||||
libnss-ldap \
|
||||
nullmailer \
|
||||
php-curl \
|
||||
php-fpm \
|
||||
php-gd \
|
||||
php-imagick \
|
||||
php-imap \
|
||||
php-json \
|
||||
php-mail \
|
||||
php-mail-mime \
|
||||
php-mbstring \
|
||||
php-net-smtp \
|
||||
php-net-socket \
|
||||
php-opcache \
|
||||
php-pspell \
|
||||
php-sqlite3 \
|
||||
php-mail \
|
||||
php7.4 \
|
||||
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 \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*.*
|
||||
|
|
|
@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
|
|||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -y --no-install-recommends \
|
||||
php-mysql \
|
||||
php7.4-mysql \
|
||||
&& apt-get clean \
|
||||
&& 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 fpm-pool.conf.tmpl /usr/local/etc
|
||||
|
|
|
@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
|
|||
RUN apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install -y --no-install-recommends \
|
||||
php-mysql \
|
||||
php7.4-pgsql \
|
||||
&& apt-get clean \
|
||||
&& 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 fpm-pool.conf.tmpl /usr/local/etc
|
||||
|
|
|
@ -4,8 +4,8 @@ set -e
|
|||
|
||||
sed "s/@user@/${FPM_USER}/g; s/@variant@/${FPM_VARIANT}/g" \
|
||||
< /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
|
||||
mkdir -p /run/php
|
||||
/usr/sbin/php-fpm7.3 --nodaemonize
|
||||
/usr/sbin/php-fpm7.4 --nodaemonize
|
||||
|
|
Loading…
Reference in a new issue