Merge pull request #277 from upstreamable/chown

Give ownership for www-data to /var/www
nextcloud · Mar 11, 2018 · 9fb10be · 9fb10be
2 parents 5c05c9e + 5714672
commit 9fb10be
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/11.0/fpm-alpine/Dockerfile b/11.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -80,8 +80,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 %%VARIANT_EXTRAS%%

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -89,8 +89,8 @@ RUN { \
         echo 'opcache.revalidate_freq=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
     \
-    chown -R www-data:root /var/www/html; \
-    chmod -R g=u /var/www/html
+    chown -R www-data:root /var/www; \
+    chmod -R g=u /var/www
 
 VOLUME /var/www/html
 %%VARIANT_EXTRAS%%