Commitfe823eb

committed

Removes user creation and group assignment from root dockerfiles

1 parent30ae531 commitfe823ebCopy full SHA for fe823eb

File tree

-44

lines changed

-44

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ services:`
`58`	`58`	`-laravel`
`59`	`59`
`60`	`60`	`composer:`
`61`		`-build:`
`62`		`-context:./dockerfiles`
`63`		`-dockerfile:composer.root.dockerfile`
	`61`	`+image:composer:2`
`64`	`62`	`container_name:composer`
`65`	`63`	`volumes:`
`66`	`64`	`-./src:/var/www/html`

Lines changed: 0 additions & 15 deletions

This file was deleted.

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,6 @@`
`1`	`1`	`FROM nginx:stable-alpine`
`2`	`2`
`3`		`-ARG UID`
`4`		`-ARG GID`
`5`		`-`
`6`		`-ENV UID=${UID}`
`7`		`-ENV GID=${GID}`
`8`		`-`
`9`		`-# 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.`
`10`		`-RUN delgroup dialout`
`11`		`-`
`12`		`-RUN addgroup -g ${GID} --system laravel`
`13`		`-RUN adduser -G laravel --system -D -s /bin/sh -u ${UID} laravel`
`14`		`-RUN sed -i"s/user nginx/user laravel/g" /etc/nginx/nginx.conf`
	`3`	`+RUN sed -i"s/user nginx/user root/g" /etc/nginx/nginx.conf`
`15`	`4`
`16`	`5`	`ADD ./nginx/default.conf /etc/nginx/conf.d/`
`17`	`6`

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,11 @@`
`1`	`1`	`FROM php:8-fpm-alpine`
`2`	`2`
`3`		`-ARG UID`
`4`		`-ARG GID`
`5`		`-`
`6`		`-ENV UID=${UID}`
`7`		`-ENV GID=${GID}`
`8`		`-`
`9`	`3`	`RUN mkdir -p /var/www/html`
`10`	`4`
`11`	`5`	`WORKDIR /var/www/html`
`12`	`6`
`13`		`-# 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.`
`14`		`-RUN delgroup dialout`
`15`		`-`
`16`		`-RUN addgroup -g ${GID} --system laravel`
`17`		`-RUN adduser -G laravel --system -D -s /bin/sh -u ${UID} laravel`
`18`		`-`
`19`		`-RUN sed -i"s/user = www-data/user = laravel/g" /usr/local/etc/php-fpm.d/www.conf`
`20`		`-RUN sed -i"s/group = www-data/group = laravel/g" /usr/local/etc/php-fpm.d/www.conf`
	`7`	`+RUN sed -i"s/user = www-data/user = root/g" /usr/local/etc/php-fpm.d/www.conf`
	`8`	`+RUN sed -i"s/group = www-data/group = root/g" /usr/local/etc/php-fpm.d/www.conf`
`21`	`9`	`RUN echo"php_admin_flag[log_errors] = on" >> /usr/local/etc/php-fpm.d/www.conf`
`22`	`10`
`23`	`11`	`RUN docker-php-ext-install pdo pdo_mysql`

Comments

(0)