Merge pull request aschmelyun#115 from aschmelyun/permissions-fix

aschmelyun · web-flow · commit 8d3bba875a3f · 2021-08-08T02:56:22.000-04:00
Fixes known permissions issues with different OS's
diff --git a/.env.example b/.env.example
@@ -0,0 +1,4 @@
+NGINXGROUP=www-data
+NGINXUSER=www-data
+PHPGROUP=www-data
+PHPUSER=www-data
diff --git a/composer.dockerfile b/composer.dockerfile
@@ -1,5 +1,11 @@
 FROM composer:2
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
+ARG PHPGROUP
+ARG PHPUSER
+
+ENV PHPGROUP=${PHPGROUP}
+ENV PHPUSER=${PHPUSER}
+
+RUN addgroup -g 1000 ${PHPGROUP} && adduser -g ${PHPGROUP} -s /bin/sh -D ${PHPUSER}; exit 0
 
 WORKDIR /var/www/html
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,9 @@ services:
     build:
       context: .
       dockerfile: nginx.dockerfile
+      args:
+        - NGINXUSER=${NGINXUSER:-www-data}
+        - NGINXGROUP=${NGINXGROUP:-www-data}
     container_name: nginx
     ports:
       - 80:80
@@ -42,6 +45,9 @@ services:
     build:
       context: .
       dockerfile: php.dockerfile
+      args:
+        - PHPUSER=${PHPUSER:-www-data}
+        - PHPGROUP=${PHPGROUP:-www-data}
     container_name: php
     volumes:
       - ./src:/var/www/html:delegated
@@ -61,13 +67,16 @@ services:
     build:
       context: .
       dockerfile: composer.dockerfile
+      args:
+        - PHPUSER=${PHPUSER:-www-data}
+        - PHPGROUP=${PHPGROUP:-www-data}
     container_name: composer
     volumes:
       - ./src:/var/www/html
     working_dir: /var/www/html
     depends_on:
       - php
-    user: laravel
+    user: ${PHPUSER:-www-data}
     entrypoint: ['composer', '--ignore-platform-reqs']
     networks:
       - laravel
@@ -89,12 +98,14 @@ services:
     build:
       context: .
       dockerfile: php.dockerfile
+      args:
+        - PHPUSER=${PHPUSER:-www-data}
+        - PHPGROUP=${PHPGROUP:-www-data}
     container_name: artisan
     volumes:
       - ./src:/var/www/html:delegated
     depends_on:
       - mysql
-    user: laravel
     working_dir: /var/www/html
     entrypoint: ['php', '/var/www/html/artisan']
     networks:
diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -1,10 +1,15 @@
 FROM nginx:stable-alpine
 
-ADD ./nginx/nginx.conf /etc/nginx/
+ARG NGINXGROUP
+ARG NGINXUSER
+
+ENV NGINXGROUP=${NGINXGROUP}
+ENV NGINXUSER=${NGINXUSER}
+
+RUN sed -i "s/user www-data/user ${NGINXUSER}/g" /etc/nginx/nginx.conf
+
 ADD ./nginx/default.conf /etc/nginx/conf.d/
 
 RUN mkdir -p /var/www/html
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
-
-RUN chown laravel:laravel /var/www/html
+RUN addgroup -g 1000 ${NGINXGROUP} && adduser -g ${NGINXGROUP} -s /bin/sh -D ${NGINXUSER}; exit 0
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
diff --git a/php.dockerfile b/php.dockerfile
@@ -1,18 +1,25 @@
 FROM php:7.4-fpm-alpine
 
-ADD ./php/www.conf /usr/local/etc/php-fpm.d/
+ARG PHPGROUP
+ARG PHPUSER
 
-RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
+ENV PHPGROUP=${PHPGROUP}
+ENV PHPUSER=${PHPUSER}
 
-RUN mkdir -p /var/www/html
+RUN addgroup -g 1000 ${PHPGROUP} && adduser -g ${PHPGROUP} -s /bin/sh -D ${PHPUSER}; exit 0
 
-RUN chown laravel:laravel /var/www/html
+RUN mkdir -p /var/www/html
 
 WORKDIR /var/www/html
 
+RUN sed -i "s/user = www-data/user = ${PHPUSER}/g" /usr/local/etc/php-fpm.d/www.conf
+RUN sed -i "s/group = www-data/group = ${PHPGROUP}/g" /usr/local/etc/php-fpm.d/www.conf
+
 RUN docker-php-ext-install pdo pdo_mysql
 
 RUN mkdir -p /usr/src/php/ext/redis \
     && curl -L https://github.com/phpredis/phpredis/archive/5.3.4.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
     && echo 'redis' >> /usr/src/php-available-exts \
     && docker-php-ext-install redis
+
+CMD ["php-fpm", "-y", "/usr/local/etc/php-fpm.conf", "-R"]
diff --git a/php/www.conf b/php/www.conf
