X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/1b5fa297017af6e3505c9f930ec7956cf7f87392..eff708d9f129fd6919401d77e1ad99966849ef8e:/Dockerfile?ds=sidebyside

diff --git a/Dockerfile b/Dockerfile
index e14c115..e88b532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,38 @@
-FROM php:7.1.1-fpm-alpine
+FROM php:7.3-fpm-alpine
 MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
+ARG USER_UID=2009
 
+# install base
 RUN apk update && \
-    apk add lighttpd git && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
-    echo "UTC" > /etc/timezone && \
-    mkdir -p /usr/local/etc/php / && \
-    mkdir /www
+    echo "UTC" > /etc/timezone
 
-WORKDIR /www
 
+# install jirafou
+RUN mkdir /www
+WORKDIR /www
 COPY .git .git
-RUN git reset --hard && rm -rf .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md
+RUN apk add git && \
+    git reset --hard && rm -rf .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
+
+
+# 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 && \
+    mkdir -p /usr/local/etc/php
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
-RUN chown -R www-data. . && \
-    chmod o=,ug=rwX -R . && \
-    apk del git && \
-    rm -rf /var/cache/apk/*
 
-CMD php-fpm -D && lighttpd -D -f /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