Switch to PHP 8.2 in Bookworm

This commit is contained in:
Jan Dittberner 2023-09-19 13:52:01 +02:00
parent 5e0a04585a
commit b56b02ab1e
6 changed files with 23 additions and 23 deletions

View file

@ -1,7 +1,7 @@
FROM gnuviech/bookworm_php8-base:latest FROM gnuviech/bookworm_php8-base:latest
LABEL maintainer="jan@dittberner.info" LABEL maintainer="jan@dittberner.info"
RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf RUN rm -f /etc/php/8.2/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

View file

@ -13,19 +13,19 @@ RUN apt-get update \
php-mail-mime \ php-mail-mime \
php-net-smtp \ php-net-smtp \
php-net-socket \ php-net-socket \
php8.1 \ php8.2 \
php8.1-curl \ php8.2-curl \
php8.1-fpm \ php8.2-fpm \
php8.1-fpm \ php8.2-fpm \
php8.1-gd \ php8.2-gd \
php8.1-imagick \ php8.2-imagick \
php8.1-imap \ php8.2-imap \
php8.1-intl \ php8.2-intl \
php8.1-mbstring \ php8.2-mbstring \
php8.1-opcache \ php8.2-opcache \
php8.1-pspell \ php8.2-pspell \
php8.1-sqlite3 \ php8.2-sqlite3 \
php8.1-zip \ php8.2-zip \
psmisc \ psmisc \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*

View file

@ -4,12 +4,12 @@ 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 \
php8.1-dba \ php8.2-dba \
php8.1-mysql \ php8.2-mysql \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*
RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf RUN rm -f /etc/php/8.2/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

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 \
php8.1-pgsql \ php8.2-pgsql \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/*.* && rm -rf /var/lib/apt/lists/*.*
RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf RUN rm -f /etc/php/8.2/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

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/8.1/fpm/pool.d/${FPM_USER}.conf" > "/etc/php/8.2/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-fpm8.1 --nodaemonize /usr/sbin/php-fpm8.2 --nodaemonize

View file

@ -2,8 +2,8 @@
set -e set -e
for dist in jessie_php5 stretch_php7 buster_php7 bullseye_php7 bookworm_php8; do for dist in buster_php7 bullseye_php7 bookworm_php8; do
docker build --pull -t gnuviech/${dist}-base ${dist} -f ${dist}/Dockerfile-base docker build --pull --no-cache -t gnuviech/${dist}-base ${dist} -f ${dist}/Dockerfile-base
docker build -t gnuviech/${dist} ${dist} -f ${dist}/Dockerfile docker build -t gnuviech/${dist} ${dist} -f ${dist}/Dockerfile
docker build -t gnuviech/${dist}-mysql ${dist} -f ${dist}/Dockerfile-mysql docker build -t gnuviech/${dist}-mysql ${dist} -f ${dist}/Dockerfile-mysql
docker build -t gnuviech/${dist}-pgsql ${dist} -f ${dist}/Dockerfile-pgsql docker build -t gnuviech/${dist}-pgsql ${dist} -f ${dist}/Dockerfile-pgsql