Better user handling (#42)

Author: rm-yakovenko

docker-compose.yml

@@ -17,9 +17,8 @@ services:
             context: ./docker/app
             args:
                 - XDEBUG
+                - CONTAINER_USER
         working_dir: /var/www/app
-        environment:
-            - CONTAINER_USER
 
     app:
         extends: app_base

docker/app/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7-fpm
 
-RUN apt-get -y -qq update && \
-    apt-get -y -qq install --no-install-recommends gosu git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev && \
+RUN apt-get -y update && \
+    apt-get -y install --no-install-recommends git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev && \
     docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr && \
     docker-php-ext-install -j$(nproc) pdo_mysql bcmath gd intl opcache zip soap xsl && \
     pecl install apcu && \
@@ -17,13 +17,12 @@ RUN curl -Lo /usr/bin/composer https://getcomposer.org/composer-stable.phar && \
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash && \
     apt-get install -y nodejs
 
-RUN useradd -m app
+ARG CONTAINER_USER
+RUN useradd -m app -u $CONTAINER_USER
 
 ARG XDEBUG
 
 RUN if [ $XDEBUG ]; then pecl install xdebug && docker-php-ext-enable xdebug; fi
 
-COPY ./docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
-
+USER app
 CMD ["php-fpm", "-F", "-R"]