epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-21 23:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: move core nginx files into more recognizable folder structure

Browse source
This commit is contained in:
RocketQuack 2026-01-29 18:52:26 +01:00
parent 23593bfadb
commit 12cf0b79fe
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/07-troubleshooting/02-windows-nginx-entrypoint-error.md
View file

@ -8,5 +8,5 @@ On Windows, files often have `CRLF` line endings, while Linux systems expect `LF
- **Convert Line Endings using `dos2unix`:** - **Convert Line Endings using `dos2unix`:**
```bash ```bash
dos2unix resources/nginx-entrypoint.sh dos2unix resources/core/nginx/nginx-entrypoint.sh
``` ```

4
docs/getting-started.md
View file

@ -103,8 +103,8 @@ Docker Compose "overrides" that extend the base compose.yaml for different scena
### 📁 resources/ - Runtime Templates ### 📁 resources/ - Runtime Templates
- **nginx-entrypoint.sh** - Dynamic Nginx configuration generator script - **core/nginx/nginx-entrypoint.sh** - Dynamic Nginx configuration generator script
- **nginx-template.conf** - Nginx configuration template with variable substitution - **core/nginx/nginx-template.conf** - Nginx configuration template with variable substitution
## Custom Apps Explained ## Custom Apps Explained

4
images/custom/Containerfile
View file

@ -2,8 +2,8 @@ ARG PYTHON_VERSION=3.11.6
ARG DEBIAN_BASE=bookworm ARG DEBIAN_BASE=bookworm
FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base
COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template COPY resources/core/nginx/nginx-template.conf /templates/nginx/frappe.conf.template
COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh COPY resources/core/nginx/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 ARG WKHTMLTOPDF_VERSION=0.12.6.1-3
ARG WKHTMLTOPDF_DISTRO=bookworm ARG WKHTMLTOPDF_DISTRO=bookworm

4
images/production/Containerfile
View file

@ -69,8 +69,8 @@ RUN useradd -ms /bin/bash frappe \
&& chown -R frappe:frappe /var/lib/nginx \ && chown -R frappe:frappe /var/lib/nginx \
&& chown -R frappe:frappe /run/nginx.pid && chown -R frappe:frappe /run/nginx.pid
COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template COPY resources/core/nginx/nginx-template.conf /templates/nginx/frappe.conf.template
COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh COPY resources/core/nginx/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
FROM base AS build FROM base AS build

0
resources/nginx-entrypoint.sh → resources/core/nginx/nginx-entrypoint.sh
View file

0
resources/nginx-template.conf → resources/core/nginx/nginx-template.conf
View file