[FEATURE] CI: Raise default PHP version

[jirafeau_project.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 569a0faa33a72c88cf5f762f1e7d7b848dc1ffb9..f0071d0679aa563b3b4371cfd021427686f21d09 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,42 @@
 FROM php:7.3-fpm-alpine
 FROM php:7.3-fpm-alpine

-MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
+MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"

 
 

+# lighttpd user
+ARG USER_UID=100
+# www-data group
+ARG GROUP_UID=82
+
+# install base

 RUN apk update && \
 RUN apk update && \

-    apk add lighttpd git && \

     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     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
 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.$GROUP_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
 
 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
-EXPOSE 80
+# cleanup
+RUN rm -rf /var/cache/apk/*
+
+
+CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
+EXPOSE 80
\ No newline at end of file