From 583e1778b88486ddf5a4c433d1664c73b02be129 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Sun, 10 May 2026 19:01:04 +0200 Subject: [PATCH 1/2] Divided files dir so it only contains relevant files when copying --- apache/Dockerfile | 2 +- files/{etc/frankenphp => frankenphp/etc}/Caddyfile | 0 files/{ => general}/usr/local/etc/php/conf.d/010-default.ini | 0 fpm/Dockerfile | 2 +- frankenphp/Dockerfile | 3 ++- 5 files changed, 4 insertions(+), 3 deletions(-) rename files/{etc/frankenphp => frankenphp/etc}/Caddyfile (100%) rename files/{ => general}/usr/local/etc/php/conf.d/010-default.ini (100%) diff --git a/apache/Dockerfile b/apache/Dockerfile index b0f1e1a..9e0c868 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -138,7 +138,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/* -COPY files / +COPY files/general / FROM runtime AS builder diff --git a/files/etc/frankenphp/Caddyfile b/files/frankenphp/etc/Caddyfile similarity index 100% rename from files/etc/frankenphp/Caddyfile rename to files/frankenphp/etc/Caddyfile diff --git a/files/usr/local/etc/php/conf.d/010-default.ini b/files/general/usr/local/etc/php/conf.d/010-default.ini similarity index 100% rename from files/usr/local/etc/php/conf.d/010-default.ini rename to files/general/usr/local/etc/php/conf.d/010-default.ini diff --git a/fpm/Dockerfile b/fpm/Dockerfile index e90c814..6f61262 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -138,7 +138,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/* -COPY files / +COPY files/general / FROM runtime AS builder diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index e44ea27..f921854 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -142,7 +142,8 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/* -COPY files / +COPY files/general / +COPY files/frankenphp / FROM runtime AS builder From 6b0b7537ca1de053ddcb2188031738b989ed66ae Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Sun, 10 May 2026 19:01:32 +0200 Subject: [PATCH 2/2] Moved npm cache to XDG cache dir --- apache/Dockerfile | 1 + fpm/Dockerfile | 1 + frankenphp/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/apache/Dockerfile b/apache/Dockerfile index 9e0c868..58c382d 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -241,6 +241,7 @@ ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 +ENV npm_config_cache="$XDG_CACHE_HOME/npm" SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 6f61262..7dc2339 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -242,6 +242,7 @@ ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 +ENV npm_config_cache="$XDG_CACHE_HOME/npm" SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index f921854..fe55e84 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -246,6 +246,7 @@ ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 +ENV npm_config_cache="$XDG_CACHE_HOME/npm" SHELL ["/bin/bash", "-o", "pipefail", "-c"]