X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/3c7edc5e72bf6a07ff80049584530b745075a185..e7ca00035309ca757f2be9dddf37b0f66d66c2b6:/Dockerfile?ds=inline

diff --git a/Dockerfile b/Dockerfile
index 58c813d..e0b81bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,41 +1,34 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
-# lighttpd user
-ARG USER_ID=100
-# www-data group
-ARG GROUP_ID=82
-
 # 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 jirafeau
 RUN mkdir /www
 WORKDIR /www
 COPY .git .git
-RUN apk add git && \
-    git reset --hard && rm -rf docker install.php .git .gitignore .gitlab-ci.yml CONTRIBUTING.md Dockerfile README.md && \
-    apk del git && \
-    touch /www/lib/config.local.php && \
-    chown -R $USER_ID.$GROUP_ID /www && \
-    chmod o=,ug=rwX -R /www
+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 && \
-    chown -R $USER_ID /var/log/lighttpd && \
-    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 /run.sh