X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/3c7edc5e72bf6a07ff80049584530b745075a185..9a72b7f56fa8d77ef5de841d2248d7bb71d9733a:/Dockerfile?ds=sidebyside

diff --git a/Dockerfile b/Dockerfile
index 58c813d..776fec0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,22 @@
 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
 
 # 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 && \
+# Will ignore some files through .dockerignore
+COPY . .
+RUN rm -rf docker && \
     touch /www/lib/config.local.php && \
-    chown -R $USER_ID.$GROUP_ID /www && \
+    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
     chmod o=,ug=rwX -R /www
 
 COPY docker/cleanup.sh /cleanup.sh
@@ -28,10 +24,7 @@ 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