Removes user creation and group assignment from root dockerfiles

aschmelyun · aschmelyun · commit fe823eb333d7 · 2021-11-07T00:37:24.000-04:00
diff --git a/docker-compose.root.yml b/docker-compose.root.yml
@@ -58,9 +58,7 @@ services:
       - laravel
 
   composer:
-    build:
-      context: ./dockerfiles
-      dockerfile: composer.root.dockerfile
+    image: composer:2
     container_name: composer
     volumes:
       - ./src:/var/www/html
diff --git a/dockerfiles/composer.root.dockerfile b/dockerfiles/composer.root.dockerfile
diff --git a/dockerfiles/nginx.root.dockerfile b/dockerfiles/nginx.root.dockerfile
@@ -1,17 +1,6 @@
 FROM nginx:stable-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID}
-ENV GID=${GID}
-
-# MacOS staff group's gid is 20, so is the dialout group in alpine linux. We're not using it, let's just remove it.
-RUN delgroup dialout
-
-RUN addgroup -g ${GID} --system laravel
-RUN adduser -G laravel --system -D -s /bin/sh -u ${UID} laravel
-RUN sed -i "s/user  nginx/user laravel/g" /etc/nginx/nginx.conf
+RUN sed -i "s/user  nginx/user root/g" /etc/nginx/nginx.conf
 
 ADD ./nginx/default.conf /etc/nginx/conf.d/
 
diff --git a/dockerfiles/php.root.dockerfile b/dockerfiles/php.root.dockerfile
@@ -1,23 +1,11 @@
 FROM php:8-fpm-alpine
 
-ARG UID
-ARG GID
-
-ENV UID=${UID}
-ENV GID=${GID}
-
 RUN mkdir -p /var/www/html
 
 WORKDIR /var/www/html
 
-# MacOS staff group's gid is 20, so is the dialout group in alpine linux. We're not using it, let's just remove it.
-RUN delgroup dialout
-
-RUN addgroup -g ${GID} --system laravel
-RUN adduser -G laravel --system -D -s /bin/sh -u ${UID} laravel
-
-RUN sed -i "s/user = www-data/user = laravel/g" /usr/local/etc/php-fpm.d/www.conf
-RUN sed -i "s/group = www-data/group = laravel/g" /usr/local/etc/php-fpm.d/www.conf
+RUN sed -i "s/user = www-data/user = root/g" /usr/local/etc/php-fpm.d/www.conf
+RUN sed -i "s/group = www-data/group = root/g" /usr/local/etc/php-fpm.d/www.conf
 RUN echo "php_admin_flag[log_errors] = on" >> /usr/local/etc/php-fpm.d/www.conf
 
 RUN docker-php-ext-install pdo pdo_mysql
