[BUGFIX] fix proposed web root during installation

[jirafeau.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index f0071d0679aa563b3b4371cfd021427686f21d09..e0b81bf10bef2abf9442119db25c8d704cd38017 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,35 @@
-FROM php:7.3-fpm-alpine
-MAINTAINER "Jérôme Jutteau <jerome@jutteau.fr>"
-
-# lighttpd user
-ARG USER_UID=100
-# www-data group
-ARG GROUP_UID=82
+FROM php:8.1-fpm-alpine
+LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
 # install base
 RUN apk update && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
+# install lighttpd
+RUN apk add lighttpd git
 
-# 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 && \
-    apk del git && \
-    chown -R $USER_UID.$GROUP_UID /www && \
-    chmod o=,ug=rwX -R /www && \
-    chmod +x docker/cleanup
+RUN git reset --hard && rm -rf docker install.php .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md
+RUN touch /www/lib/config.local.php
+RUN chown -R $(id -u lighttpd).$(id -g www-data) /www
+RUN 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 && \
-    mkdir -p /usr/local/etc/php
+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
 
-
 # cleanup
+RUN apk del git
 RUN rm -rf /var/cache/apk/*
 
-
-CMD /www/docker/cleanup & php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf
+CMD /run.sh
 EXPOSE 80
\ No newline at end of file