From 252203766605dd839ae0f36dabc1bb47ace4418d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 30 May 2019 13:23:37 +0200 Subject: [PATCH] Fixes #763, non-root usage with enabled redis session handler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stephan Müller --- 14.0/apache/Dockerfile | 1 + 14.0/fpm-alpine/Dockerfile | 1 + 14.0/fpm/Dockerfile | 1 + 15.0/apache/Dockerfile | 1 + 15.0/fpm-alpine/Dockerfile | 1 + 15.0/fpm/Dockerfile | 1 + 16.0/apache/Dockerfile | 1 + 16.0/fpm-alpine/Dockerfile | 1 + 16.0/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 11 files changed, 11 insertions(+) diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile index 3e500b8a9..ac637da7b 100644 --- a/14.0/apache/Dockerfile +++ b/14.0/apache/Dockerfile @@ -95,6 +95,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile index 7da287209..d83e7204e 100644 --- a/14.0/fpm-alpine/Dockerfile +++ b/14.0/fpm-alpine/Dockerfile @@ -84,6 +84,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile index c8f8d01bd..2072c2a33 100644 --- a/14.0/fpm/Dockerfile +++ b/14.0/fpm/Dockerfile @@ -95,6 +95,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 6f1dc4967..7df793131 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -96,6 +96,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index ff199a509..4f759a3b3 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -85,6 +85,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index 323281c5d..d15002dd9 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -96,6 +96,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile index 6d96f90bd..d87934716 100644 --- a/16.0/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -96,6 +96,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/16.0/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile index c8158c1d9..1638d2f87 100644 --- a/16.0/fpm-alpine/Dockerfile +++ b/16.0/fpm-alpine/Dockerfile @@ -85,6 +85,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile index 01a47cbc9..2136db42a 100644 --- a/16.0/fpm/Dockerfile +++ b/16.0/fpm/Dockerfile @@ -96,6 +96,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index e35d18070..d7a05627f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -84,6 +84,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index d7a002642..e66bd88ec 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -95,6 +95,7 @@ RUN { \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ + chown www-data:root /usr/local/etc/php/conf.d; \ mkdir /var/www/data; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www