[TASK] re-arrange Docker overlays to speedup image creation

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/Dockerfile b/Dockerfile
index 776fec0fc4696d73b167423242c8be1a9df23464..9eb04233aa3b0d2d3acd2d55a0126c62a336b24f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,21 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 

-# install base
+# base install

 RUN apk update && \
 RUN apk update && \

+    apk add lighttpd && \
+    rm -rf /var/cache/apk/* && \

     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
 

-# install lighttpd
-RUN apk add lighttpd
+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
+
+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

 
 # install jirafeau
 RUN mkdir /www
 
 # install jirafeau
 RUN mkdir /www


@@ -19,17 +27,5 @@ RUN rm -rf docker && \
     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 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
-
-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 rm -rf /var/cache/apk/*
-

 CMD /run.sh
 EXPOSE 80
\ No newline at end of file
 CMD /run.sh
 EXPOSE 80
\ No newline at end of file