|
@@ -1,25 +1,27 @@
|
|
-FROM ubuntu:20.04
|
|
|
|
|
|
+FROM ubuntu:20.10
|
|
|
|
|
|
ARG DEBIAN_FRONTEND=noninteractive
|
|
ARG DEBIAN_FRONTEND=noninteractive
|
|
|
|
|
|
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
|
|
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
|
|
|
|
+
|
|
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
|
|
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
|
|
|
|
+
|
|
RUN apt-get update -yqq > /dev/null && \
|
|
RUN apt-get update -yqq > /dev/null && \
|
|
apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
|
|
apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
|
|
- zlibc zlib1g zlib1g-dev libpcre3 libpcre3-dev libargon2-0-dev libsodium-dev \
|
|
|
|
- php7.4 php7.4-common php7.4-dev libphp7.4-embed php7.4-pgsql nginx > /dev/null
|
|
|
|
|
|
+ zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
|
|
|
|
+ php8.0-cli php8.0-dev libphp8.0-embed php8.0-pgsql nginx > /dev/null
|
|
|
|
|
|
ADD ./ ./
|
|
ADD ./ ./
|
|
|
|
|
|
-ENV NGINX_VERSION=1.19.2
|
|
|
|
|
|
+ENV NGINX_VERSION=1.19.8
|
|
|
|
|
|
-RUN git clone -b v0.0.24 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
|
|
|
|
|
|
+RUN git clone -b v0.0.25 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
|
|
|
|
|
|
RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
|
|
RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
|
|
tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
|
|
tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
|
|
cd nginx-${NGINX_VERSION} && \
|
|
cd nginx-${NGINX_VERSION} && \
|
|
- export PHP_LIB=/usr/lib && \
|
|
|
|
- ./configure --user=www-data --group=www-data \
|
|
|
|
|
|
+ export PHP_LIB=/usr/lib && \
|
|
|
|
+ bash ./configure --user=www --group=www \
|
|
--prefix=/nginx \
|
|
--prefix=/nginx \
|
|
--with-ld-opt="-Wl,-rpath,$PHP_LIB" \
|
|
--with-ld-opt="-Wl,-rpath,$PHP_LIB" \
|
|
--add-module=/ngx_php7/third_party/ngx_devel_kit \
|
|
--add-module=/ngx_php7/third_party/ngx_devel_kit \
|
|
@@ -39,6 +41,7 @@ RUN chmod 777 -R app/cache/*
|
|
COPY /deploy/conf/ngx/pgsql/raw/ngxServices.php /app/config/ngxServices.php
|
|
COPY /deploy/conf/ngx/pgsql/raw/ngxServices.php /app/config/ngxServices.php
|
|
|
|
|
|
RUN echo "opcache.preload=/app/config/preloader.script.php" >> /deploy/conf/php.ini
|
|
RUN echo "opcache.preload=/app/config/preloader.script.php" >> /deploy/conf/php.ini
|
|
|
|
+RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /deploy/conf/php.ini
|
|
|
|
|
|
RUN export WORKERS=$(( 4 * $(nproc) )) && \
|
|
RUN export WORKERS=$(( 4 * $(nproc) )) && \
|
|
sed -i "s|worker_processes auto|worker_processes $WORKERS|g" /deploy/conf/ngx/nginx.conf
|
|
sed -i "s|worker_processes auto|worker_processes $WORKERS|g" /deploy/conf/ngx/nginx.conf
|