From: Jerome Jutteau <jerome@jutteau.fr>
Date: Tue, 5 Jul 2022 11:19:20 +0000 (+0200)
Subject: [TASK] re-arrange Docker overlays to speedup image creation
X-Git-Tag: 4.5.0~14
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/aec88112ff1290657dbbdbc715ccff6d88b821cd

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

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

diff --git a/Dockerfile b/Dockerfile
index 776fec0..9eb0423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,21 @@
 FROM php:8.1-fpm-alpine
 LABEL org.opencontainers.image.authors="jerome@jutteau.fr"
 
-# 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
 
-# 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
@@ -19,17 +27,5 @@ RUN rm -rf docker && \
     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