X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/aec88112ff1290657dbbdbc715ccff6d88b821cd..b269224a37d80a40ef609bf5a8e4ed2e8ab2838d:/Dockerfile?ds=inline

diff --git a/Dockerfile b/Dockerfile
index 9eb0423..6bf9788 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
+ARG INI="php"
 
 # base install
 RUN apk update && \
@@ -8,24 +9,21 @@ RUN apk update && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
-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 --chmod=550 docker/cleanup.sh docker/run.sh  /
+COPY --chmod=640 docker/docker_config.php /docker_config.php
 
-RUN mkdir -p /usr/local/etc/php
-COPY docker/php.ini /usr/local/etc/php/php.ini
+COPY docker/${INI}.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
-# install jirafeau
-RUN mkdir /www
+# Install Jirafeau
 WORKDIR /www
-# Will ignore some files through .dockerignore
-COPY . .
-RUN rm -rf docker && \
+
+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 o=,ug=rwX -R /www
+    chown -R $(id -u lighttpd):$(id -g www-data) /www && \
+    chmod 770 /www
 
-CMD /run.sh
-EXPOSE 80
\ No newline at end of file
+CMD ["/run.sh"]
+EXPOSE 80