[TASK] add line returns for admin cli

[jirafeau_mojo42.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index fe59b7ea9e0aba44ffa368cf287e46d03e03387a..dd75d58ae1770b14de2039e77a693ce8a0f67b0e 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
 FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
-ARG USER_UID=2009
+
+# lighttpd user
+ARG USER_UID=100
+# www-data group
+ARG GROUP_UID=82
 
 # install base
 RUN apk update && \
@@ -8,17 +12,22 @@ 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 .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_UID.$GROUP_UID /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
+COPY docker/docker_config.php /docker_config.php
 
 # install lighttpd
 RUN apk add lighttpd php7-mcrypt && \
@@ -34,5 +43,5 @@ COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 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