updated php to 7.3, added rsyslog to php, some php.ini and nginx twix

This commit is contained in:
Bachir Soussi Chiadmi 2019-05-28 12:52:30 +02:00
parent 8bf5be5e59
commit ceaf3963b0
10 changed files with 44 additions and 7 deletions

View File

@ -29,6 +29,7 @@ server {
fastcgi_intercept_errors off;
fastcgi_buffer_size 16k;
fastcgi_buffers 4 16k;
# fastcgi_read_timeout 150;
}
location ~ /\.ht {

View File

@ -23,6 +23,10 @@ RUN apt-get update && apt-get install -y \
composer global install && \
ln -s /usr/local/composer/vendor/drush/drush/drush /usr/local/bin/drush
RUN apt-get install -y rsyslog
COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf
# ENTRYPOINT ["sh", "-c", "service rsyslog start ; tail -f /dev/null"]
COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
COPY ./bashrc /root/.bashrc

View File

@ -1 +1,6 @@
memory_limit = 526M
; Log level
; Possible Values: alert, error, warning, notice, debug
; Default Value: notice
log_level = debug

View File

@ -0,0 +1 @@
local7.* /var/log/drupal.log

View File

@ -1,4 +1,4 @@
FROM php:7.0-fpm-stretch
FROM php:7.3-fpm
RUN apt-get update && apt-get install -y \
libfreetype6-dev \
@ -6,8 +6,9 @@ RUN apt-get update && apt-get install -y \
libmcrypt-dev \
libpng-dev \
mysql-client \
zip && \
docker-php-ext-install -j$(nproc) mcrypt iconv && \
zip \
libzip-dev && \
# docker-php-ext-install -j$(nproc) iconv && \
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
apt-get install -y imagemagick libmagickwand-dev && \
pecl install imagick && docker-php-ext-enable imagick && \
@ -30,14 +31,19 @@ RUN export COMPOSER_HOME=/usr/local/composer && \
-L -o /usr/local/bin/drush && \
chmod +x /usr/local/bin/drush
COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
RUN apt-get install -y curl && \
curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && \
apt-get install -y nodejs yarn
RUN apt-get install -y rsyslog
COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf
# ENTRYPOINT ["sh", "-c", "service rsyslog start ; tail -f /dev/null"]
COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
# COPY ./php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf
COPY ./bashrc /root/.bashrc
COPY ./inputrc /root/.inputrc

View File

@ -1,6 +1,7 @@
memory_limit = 1024M
upload_max_filesize = 50M
post_max_size = 50M
;max_execution_time = 150
; Log level
; Possible Values: alert, error, warning, notice, debug

View File

@ -0,0 +1 @@
request_terminate_timeout = 150

View File

@ -0,0 +1 @@
local6.* /var/log/drupal.log

View File

@ -0,0 +1,17 @@
[Unit]
Description=rsyslog
After=docker.service
Requires=docker.service
[Service]
ExecStartPre=-/usr/bin/docker rm %n
ExecStart=/usr/bin/docker run --rm \
--name %n \
-h %H \
jumanjiman/rsyslog
ExecStop=/usr/bin/docker stop %n
RestartSec=5s
Restart=always
[Install]
WantedBy=multi-user.target

@ -1 +1 @@
Subproject commit b764ef206e250dc69db16df65615f64f18d55dc9
Subproject commit 2e69e3fd4c5cae1b24a96933d645b527459529bb