Update docker image

This commit is contained in:
Julien Nahum 2023-09-08 18:44:03 +02:00
parent 7119ec2304
commit 6fc1de54dd
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
ARG PHP_PACKAGES="php8.1 composer php8.1-common php8.1-pgsql php8.1-redis php8.1-mbstring\ ARG PHP_PACKAGES="php8.2 composer php8.2-common php8.2-pgsql php8.2-redis php8.2-mbstring\
php8.1-simplexml php8.1-bcmath php8.1-gd php8.1-curl php8.1-zip\ php8.2-simplexml php8.2-bcmath php8.2-gd php8.2-curl php8.2-zip\
php8.1-imagick php8.1-bz2 php8.1-gmp php8.1-int php8.1-pcov php8.1-soap php8.1-xsl" php8.2-imagick php8.2-bz2 php8.2-gmp php8.2-int php8.2-pcov php8.2-soap php8.2-xsl"
FROM node:16 AS javascript-builder FROM node:16 AS javascript-builder
WORKDIR /app WORKDIR /app
@ -61,11 +61,11 @@ ARG PHP_PACKAGES
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
supervisor nginx sudo postgresql-15 redis\ supervisor nginx sudo postgresql-15 redis\
$PHP_PACKAGES php8.1-fpm\ $PHP_PACKAGES php8.2-fpm\
&& apt-get clean && apt-get clean
ADD docker/postgres-wrapper.sh docker/php-fpm-wrapper.sh docker/redis-wrapper.sh /usr/local/bin/ ADD docker/postgres-wrapper.sh docker/php-fpm-wrapper.sh docker/redis-wrapper.sh /usr/local/bin/
ADD docker/php-fpm.conf /etc/php/8.1/fpm/pool.d/ ADD docker/php-fpm.conf /etc/php/8.2/fpm/pool.d/
ADD docker/nginx.conf /etc/nginx/sites-enabled/default ADD docker/nginx.conf /etc/nginx/sites-enabled/default
ADD docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
ADD .env.docker .env ADD .env.docker .env

View File

@ -30,6 +30,6 @@ ln -sf /persist/storage /app/storage
. /app/.env . /app/.env
} }
/usr/sbin/php-fpm8.1 /usr/sbin/php-fpm8.2
tail -f /var/log/opnform.log tail -f /var/log/opnform.log