Merge branch 'bug_content_length' into 'next-release'

[jirafeau_project.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 9eb04233aa3b0d2d3acd2d55a0126c62a336b24f..d4854a8fcbdf4e01f330a041f1f4577d0feb83e9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,24 +8,21 @@ RUN apk update && \
     ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime  && \
     echo "UTC" > /etc/timezone
 
     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/lighttpd.conf /etc/lighttpd/lighttpd.conf
 
 COPY docker/php.ini /usr/local/etc/php/php.ini
 COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
 

-# install jirafeau
-RUN mkdir /www
+# Install Jirafeau

 WORKDIR /www
 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 && \
     touch /www/lib/config.local.php && \
     chown -R $(id -u lighttpd).$(id -g www-data) /www && \

-    chmod o=,ug=rwX -R /www
+    chmod 770 /www

 
 

-CMD /run.sh
+CMD ["/run.sh"]

 EXPOSE 80
\ No newline at end of file
 EXPOSE 80
\ No newline at end of file