From 9cd08b1c9ebbaea023df5e5464c70230adfb6def Mon Sep 17 00:00:00 2001 From: Javic Date: Mon, 16 Sep 2019 16:44:39 +0200 Subject: [PATCH 1/2] add uid and gid as parameters --- nginx/1.13/Dockerfile | 6 ++++-- node-php/node8-php7.1/Dockerfile | 5 +++++ php/7.1-fpm/Dockerfile | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nginx/1.13/Dockerfile b/nginx/1.13/Dockerfile index 91ed638..ada6a79 100644 --- a/nginx/1.13/Dockerfile +++ b/nginx/1.13/Dockerfile @@ -1,3 +1,5 @@ +ARG UID=1000 +ARG GID=1000 FROM nginx:1.13 MAINTAINER Juan Alonso @@ -5,8 +7,8 @@ RUN apt-get update \ && apt-get install -y sudo \ && rm -rf /var/lib/apt/lists/* -RUN groupadd -g 1000 app \ - && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app +RUN groupadd -g $GID app \ + && useradd -g $GID -u $UID -d /var/www -s /bin/bash app RUN touch /var/run/nginx.pid RUN mkdir /sock RUN chown -R app:app /var/cache/nginx/ /var/run/nginx.pid /sock diff --git a/node-php/node8-php7.1/Dockerfile b/node-php/node8-php7.1/Dockerfile index b12ae37..3fb8506 100644 --- a/node-php/node8-php7.1/Dockerfile +++ b/node-php/node8-php7.1/Dockerfile @@ -1,3 +1,5 @@ +ARG UID=1000 +ARG GID=1000 FROM node:8 RUN apt-get update -y @@ -23,6 +25,9 @@ RUN apt-get update && \ php7.1-pdo-mysql \ && apt-get clean +RUN usermod -u $UID app \ + && groupmod -g $GID app + RUN mkdir -p /home/app \ && usermod -d /home/app -l app node \ && chown -R app /home/app diff --git a/php/7.1-fpm/Dockerfile b/php/7.1-fpm/Dockerfile index 29a90b8..d7977b8 100644 --- a/php/7.1-fpm/Dockerfile +++ b/php/7.1-fpm/Dockerfile @@ -1,3 +1,5 @@ +ARG UID=1000 +ARG GID=1000 FROM php:7.1-fpm MAINTAINER Fabio Righi @@ -60,8 +62,8 @@ RUN curl -sS -O https://files.magerun.net/n98-magerun2-latest.phar \ && chmod +x ./n98-magerun2-latest.phar \ && mv ./n98-magerun2-latest.phar /usr/local/bin/n98-magerun2 -RUN groupadd -g 1000 app \ - && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app +RUN groupadd -g $GID app \ + && useradd -g $GID -u $UID -d /var/www -s /bin/bash app COPY conf/www.conf /usr/local/etc/php-fpm.d/ COPY conf/php.ini /usr/local/etc/php/ From 5f59b410393f67ba150d88b6ada6272cea54fba1 Mon Sep 17 00:00:00 2001 From: Javic Date: Wed, 2 Oct 2019 12:52:07 +0200 Subject: [PATCH 2/2] Fix ARG position --- nginx/1.13/Dockerfile | 5 +++-- node-php/node8-php7.1/Dockerfile | 3 ++- php/7.1-fpm/Dockerfile | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nginx/1.13/Dockerfile b/nginx/1.13/Dockerfile index ada6a79..1daea9f 100644 --- a/nginx/1.13/Dockerfile +++ b/nginx/1.13/Dockerfile @@ -1,8 +1,9 @@ -ARG UID=1000 -ARG GID=1000 FROM nginx:1.13 MAINTAINER Juan Alonso +ARG UID=1000 +ARG GID=1000 + RUN apt-get update \ && apt-get install -y sudo \ && rm -rf /var/lib/apt/lists/* diff --git a/node-php/node8-php7.1/Dockerfile b/node-php/node8-php7.1/Dockerfile index 3fb8506..cd64641 100644 --- a/node-php/node8-php7.1/Dockerfile +++ b/node-php/node8-php7.1/Dockerfile @@ -1,6 +1,7 @@ +FROM node:8 + ARG UID=1000 ARG GID=1000 -FROM node:8 RUN apt-get update -y RUN npm install -g grunt-cli && npm install -g bower diff --git a/php/7.1-fpm/Dockerfile b/php/7.1-fpm/Dockerfile index d7977b8..c562327 100644 --- a/php/7.1-fpm/Dockerfile +++ b/php/7.1-fpm/Dockerfile @@ -1,8 +1,9 @@ -ARG UID=1000 -ARG GID=1000 FROM php:7.1-fpm MAINTAINER Fabio Righi +ARG UID=1000 +ARG GID=1000 + RUN apt-get update && apt-get install -y \ cron \ git \