Swaps user/group 1000:1000 for laravel:laravel across php/nginx containers

aschmelyun · aschmelyun · commit 866ffe3f3e77 · 2020-09-12T00:55:17.000-04:00
diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -1,6 +1,10 @@
 FROM nginx:stable-alpine
 
-RUN addgroup -S 1000 && adduser -S 1000 -G 1000
-
 ADD ./nginx/nginx.conf /etc/nginx/nginx.conf
-ADD ./nginx/default.conf /etc/nginx/conf.d/default.conf
+ADD ./nginx/default.conf /etc/nginx/conf.d/default.conf
+
+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
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -1,4 +1,4 @@
-user 1000;
+user laravel;
 worker_processes  auto;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/php.dockerfile b/php.dockerfile
@@ -1,9 +1,13 @@
 FROM php:7.4-fpm-alpine
 
-RUN addgroup -S 1000 && adduser -S 1000 -G 1000
-
 ADD ./php/www.conf /usr/local/etc/php-fpm.d/www.conf
 
+RUN addgroup -g 1000 laravel && adduser -G laravel -g laravel -s /bin/sh -D laravel
+
+RUN mkdir -p /var/www/html
+
+RUN chown laravel:laravel /var/www/html
+
 WORKDIR /var/www/html
 
 RUN docker-php-ext-install pdo pdo_mysql
diff --git a/php/www.conf b/php/www.conf
@@ -20,8 +20,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = 1000
-group = 1000
+user = laravel
+group = laravel
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-user 1000;`
	`1`	`+user laravel;`
`2`	`2`	`worker_processes auto;`
`3`	`3`
`4`	`4`	`error_log /var/log/nginx/error.log warn;`