mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-17 13:55:08 +00:00
refactor: move core nginx files into more recognizable folder structure
This commit is contained in:
parent
23593bfadb
commit
12cf0b79fe
6 changed files with 7 additions and 7 deletions
|
|
@ -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
|
||||
```
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue