[TASK] update CI to add PHP 8.1

[jirafeau.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index e14c115bb53892aa358ca757c7f0dd916ca6d518..9eb04233aa3b0d2d3acd2d55a0126c62a336b24f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,31 @@
-FROM php:7.1.1-fpm-alpine
-MAINTAINER "Jérôme Jutteau <mojo@jirafeau.net>"
+FROM php:8.1-fpm-alpine
+LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
+# base install
 RUN apk update && \
-    apk add lighttpd git && \
+    apk add lighttpd && \
+    rm -rf /var/cache/apk/* && \
     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
+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
 
-COPY .git .git
-RUN git reset --hard && rm -rf .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md
+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/*
+# install jirafeau
+RUN mkdir /www
+WORKDIR /www
+# Will ignore some files through .dockerignore
+COPY . .
+RUN rm -rf docker && \
+    touch /www/lib/config.local.php && \
+    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chmod o=,ug=rwX -R /www
 
-CMD php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
-EXPOSE 80
+CMD /run.sh
+EXPOSE 80
\ No newline at end of file