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

diff --git a/Dockerfile b/Dockerfile
index 58c813d..d4854a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,28 @@
 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
+# base install
 RUN apk update && \
+    apk add lighttpd && \
+    rm -rf /var/cache/apk/* && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
+COPY --chmod=550 docker/cleanup.sh docker/run.sh  /
+COPY --chmod=640 docker/docker_config.php /docker_config.php
 
-# 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
-
-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
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
-# cleanup
-RUN rm -rf /var/cache/apk/*
+# Install Jirafeau
+WORKDIR /www
+
+RUN --mount=type=bind,source=.,target=/mnt \
+    cp -r /mnt/* /www/ && \
+    rm -rf /www/docker && \
+    touch /www/lib/config.local.php && \
+    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chmod 770 /www
 
-CMD /run.sh
+CMD ["/run.sh"]
 EXPOSE 80
\ No newline at end of file