From 12cf0b79fe452f6272711f6cb70bfac9ae6fc3af Mon Sep 17 00:00:00 2001 From: RocketQuack <202538874+Rocket-Quack@users.noreply.github.com> Date: Thu, 29 Jan 2026 18:52:26 +0100 Subject: [PATCH] refactor: move core nginx files into more recognizable folder structure --- docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md | 2 +- docs/getting-started.md | 4 ++-- images/custom/Containerfile | 4 ++-- images/production/Containerfile | 4 ++-- resources/{ => core/nginx}/nginx-entrypoint.sh | 0 resources/{ => core/nginx}/nginx-template.conf | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename resources/{ => core/nginx}/nginx-entrypoint.sh (100%) rename resources/{ => core/nginx}/nginx-template.conf (100%) diff --git a/docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md b/docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md index 7be1c2ca..112ed0ea 100644 --- a/docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md +++ b/docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md @@ -8,5 +8,5 @@ On Windows, files often have `CRLF` line endings, while Linux systems expect `LF - **Convert Line Endings using `dos2unix`:** ```bash - dos2unix resources/nginx-entrypoint.sh + dos2unix resources/core/nginx/nginx-entrypoint.sh ``` diff --git a/docs/getting-started.md b/docs/getting-started.md index f87b8617..c3411744 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -103,8 +103,8 @@ Docker Compose "overrides" that extend the base compose.yaml for different scena ### 📁 resources/ - Runtime Templates -- **nginx-entrypoint.sh** - Dynamic Nginx configuration generator script -- **nginx-template.conf** - Nginx configuration template with variable substitution +- **core/nginx/nginx-entrypoint.sh** - Dynamic Nginx configuration generator script +- **core/nginx/nginx-template.conf** - Nginx configuration template with variable substitution ## Custom Apps Explained diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 06182d42..21523892 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -2,8 +2,8 @@ ARG PYTHON_VERSION=3.11.6 ARG DEBIAN_BASE=bookworm FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base -COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template -COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh +COPY resources/core/nginx/nginx-template.conf /templates/nginx/frappe.conf.template +COPY resources/core/nginx/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_DISTRO=bookworm diff --git a/images/production/Containerfile b/images/production/Containerfile index 563bc763..d44f3878 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -69,8 +69,8 @@ RUN useradd -ms /bin/bash frappe \ && chown -R frappe:frappe /var/lib/nginx \ && chown -R frappe:frappe /run/nginx.pid -COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template -COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh +COPY resources/core/nginx/nginx-template.conf /templates/nginx/frappe.conf.template +COPY resources/core/nginx/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh FROM base AS build diff --git a/resources/nginx-entrypoint.sh b/resources/core/nginx/nginx-entrypoint.sh similarity index 100% rename from resources/nginx-entrypoint.sh rename to resources/core/nginx/nginx-entrypoint.sh diff --git a/resources/nginx-template.conf b/resources/core/nginx/nginx-template.conf similarity index 100% rename from resources/nginx-template.conf rename to resources/core/nginx/nginx-template.conf