X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/36e0d29e64f711ed170d431542cf62eeb42b96d7..5058cbd048a108666d4078c692cb12ce96e521db:/Dockerfile?ds=inline

diff --git a/Dockerfile b/Dockerfile
index dd75d58..4256ea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
 
 # lighttpd user
-ARG USER_UID=100
+ARG USER_ID=100
 # www-data group
-ARG GROUP_UID=82
+ARG GROUP_ID=82
 
 # install base
 RUN apk update && \
@@ -17,31 +17,27 @@ RUN mkdir /www
 WORKDIR /www
 COPY .git .git
 RUN apk add git && \
-    git reset --hard && rm -rf docker .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \
+    git reset --hard && rm -rf docker install.php .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \
     apk del git && \
     touch /www/lib/config.local.php && \
-    chown -R $USER_UID.$GROUP_UID /www && \
+    chown -R $USER_ID.$GROUP_ID /www && \
     chmod o=,ug=rwX -R /www
 
 COPY docker/cleanup.sh /cleanup.sh
-RUN chmod o=,ug=rx /cleanup.sh
 COPY docker/run.sh /run.sh
-RUN chmod o=,ug=rx /run.sh
+RUN chmod o=,ug=rx /cleanup.sh /run.sh
 COPY docker/docker_config.php /docker_config.php
 
 # install lighttpd
 RUN apk add lighttpd php7-mcrypt && \
     echo "extension=/usr/lib/php7/modules/mcrypt.so" > /usr/local/etc/php/conf.d/mcrypt.ini && \
-    chown -R $USER_UID /var/log/lighttpd && \
-    chmod oug=rwX /run && \
+    chown -R $USER_ID /var/log/lighttpd && \
     mkdir -p /usr/local/etc/php
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
-
 # cleanup
 RUN rm -rf /var/cache/apk/*
 
-
 CMD /run.sh
 EXPOSE 80
\ No newline at end of file