X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/880e59e188149478221d2af9f76599ac07ff843b..3e84a5debe0984bea841016ba587b109031a7816:/Dockerfile?ds=sidebyside

diff --git a/Dockerfile b/Dockerfile
index 848048d..4256ea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
 FROM php:7.3-fpm-alpine
-MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
-ARG USER_UID=0
+MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
+
+# lighttpd user
+ARG USER_ID=100
+# www-data group
+ARG GROUP_ID=82
 
 # install base
 RUN apk update && \
@@ -8,31 +12,32 @@ RUN apk update && \
     echo "UTC" > /etc/timezone
 
 
-# install jirafou
+# install jirafeau
 RUN mkdir /www
 WORKDIR /www
 COPY .git .git
 RUN apk add git && \
-    git reset --hard && rm -rf .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 && \
-    chown -R $USER_UID /www && \
-    chmod o=,ug=rwX -R /www && \
-    chmod +x docker/cleanup
+    touch /www/lib/config.local.php && \
+    chown -R $USER_ID.$GROUP_ID /www && \
+    chmod o=,ug=rwX -R /www
 
+COPY docker/cleanup.sh /cleanup.sh
+COPY docker/run.sh /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 /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
-EXPOSE 80
+CMD /run.sh
+EXPOSE 80
\ No newline at end of file