|
@@ -1,25 +1,25 @@
|
|
-FROM ubuntu:19.04
|
|
|
|
|
|
+FROM ubuntu:19.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
|
|
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
|
|
RUN apt-get update -yqq > /dev/null && \
|
|
RUN apt-get update -yqq > /dev/null && \
|
|
- apt-get install -yqq nginx git unzip php7.3 php7.3-common php7.3-cli php7.3-fpm php7.3-mysql > /dev/null
|
|
|
|
|
|
+ apt-get install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-mysql > /dev/null
|
|
|
|
|
|
RUN apt-get install -yqq composer > /dev/null
|
|
RUN apt-get install -yqq composer > /dev/null
|
|
|
|
|
|
-COPY deploy/conf/* /etc/php/7.3/fpm/
|
|
|
|
|
|
+COPY deploy/conf/* /etc/php/7.4/fpm/
|
|
|
|
|
|
ADD ./ /codeigniter
|
|
ADD ./ /codeigniter
|
|
WORKDIR /codeigniter
|
|
WORKDIR /codeigniter
|
|
|
|
|
|
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
|
|
|
|
|
|
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.4/fpm/php-fpm.conf ; fi;
|
|
ARG BENCHMARK_ENV
|
|
ARG BENCHMARK_ENV
|
|
RUN if [ ${BENCHMARK_ENV} = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
|
|
RUN if [ ${BENCHMARK_ENV} = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
|
|
#RUN if [ $BENCHMARK_ENV = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
|
|
#RUN if [ $BENCHMARK_ENV = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
|
|
|
|
|
|
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
|
|
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
|
|
|
|
|
|
-CMD service php7.3-fpm start && \
|
|
|
|
|
|
+CMD service php7.4-fpm start && \
|
|
nginx -c /codeigniter/deploy/nginx-fpm.conf -g "daemon off;"
|
|
nginx -c /codeigniter/deploy/nginx-fpm.conf -g "daemon off;"
|