feat(docker): revert alpine-develop to app user

graycoreio · Sep 25, 2019 · 9450ccc · 9450ccc
1 parent 0bbaf82
commit 9450ccc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
@@ -22,6 +22,7 @@ jobs:
       - name: Publish tag image
         run: docker push graycore/magento-php:7.2-fpm-alpine-${GITHUB_REF##*/}
   build-php-7-2-alpine-develop:
+    needs: build-php-7-2-alpine
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -16,7 +16,6 @@ services:
       - ../index.php:/var/www/html/index.php:cached
       - ../mage2docker-modules:/var/www/html/mage2docker-modules:cached
       - ../nginx.conf.sample:/var/www/html/nginx.conf:cached
-      - ../vendor/.htaccess:/var/www/html/vendor/.htaccess:cached
       - ../composer.json:/var/www/html/composer.json:delegated
       - ../composer.lock:/var/www/html/composer.lock:delegated
   ingress:

diff --git a/php/7.2/alpine-develop/Dockerfile b/php/7.2/alpine-develop/Dockerfile
@@ -14,6 +14,25 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
 
 COPY conf/php.ini /usr/local/etc/php/
 
+ENV MAGENTO_USER=app
+ENV MAGENTO_USER_UID=1000
+ENV MAGENTO_USER_GID=1000
+
+RUN addgroup --gid "$MAGENTO_USER_GID" "$MAGENTO_USER" && adduser \
+    --disabled-password \
+    --gecos "" \
+    --no-create-home \
+    --ingroup "$MAGENTO_USER" \
+    --uid "$MAGENTO_USER_UID" \
+    -h /var/www \
+    -s /bin/bash "$MAGENTO_USER"
+
+RUN mkdir -p /var/www/html
+
+RUN chown app:app /var/www/html
+
+USER app:app
+
 VOLUME /var/www/html
 
 WORKDIR /var/www/html