Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .docker/nginx.conf

This file was deleted.

52 changes: 0 additions & 52 deletions .docker/templates/default.conf.template

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file.
- Added vitest for frontend unit tests.
- Updated infrastructure and image build for mono-repo.
- Fixed nginx static-file location to fall back to PHP so LiipImagineBundle can generate missing thumbnails (#370).
- Unified nginx config: dev compose now mounts the production template/nginx.conf so local matches deployed behavior (#370).
- Annotated `.env` so it serves as the canonical, self-documenting Symfony
env example, with a CI check that enforces it stays in sync with `config/`.

Expand Down
5 changes: 3 additions & 2 deletions docker-compose.server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ services:
depends_on:
- phpfpm
volumes:
- ./.docker/templates:/etc/nginx/templates:ro
- ./.docker/nginx.conf:/etc/nginx/nginx.conf:ro
- ./infrastructure/nginx/etc/templates:/etc/nginx/templates:ro
- ./infrastructure/nginx/etc/nginx.conf:/etc/nginx/nginx.conf:ro
- .:/app
environment:
NGINX_FPM_SERVICE: ${COMPOSE_PROJECT_NAME}-phpfpm-1:9000
NGINX_WEB_ROOT: /app/public
NGINX_PORT: 8080
NGINX_MAX_BODY_SIZE: 5M
NGINX_SET_REAL_IP_FROM: 172.16.0.0/12
labels:
- "traefik.enable=true"
- "traefik.docker.network=frontend"
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ services:
ports:
- "8080"
volumes:
- ./.docker/templates:/etc/nginx/templates:ro
- ./infrastructure/nginx/etc/templates:/etc/nginx/templates:ro
- ./infrastructure/nginx/etc/nginx.conf:/etc/nginx/nginx.conf:ro
- .:/app
environment:
NGINX_FPM_SERVICE: ${COMPOSE_PROJECT_NAME}-phpfpm-1:9000
NGINX_WEB_ROOT: /app/public
NGINX_PORT: 8080
NGINX_MAX_BODY_SIZE: 5M
NGINX_SET_REAL_IP_FROM: 172.16.0.0/12
labels:
- "traefik.enable=true"
- "traefik.docker.network=frontend"
Expand Down
3 changes: 2 additions & 1 deletion infrastructure/nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ ENV APP_CLIENT_PATH=/app \
APP_API_PATH=/var/www/html \
NGINX_PORT=8080 \
NGINX_SET_REAL_IP_FROM=172.17.0.0/16 \
NGINX_MAX_BODY_SIZE=10m
NGINX_MAX_BODY_SIZE=10m \
NGINX_WEB_ROOT=/var/www/html/public

WORKDIR ${APP_API_PATH}

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/nginx/etc/templates/default.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ server {
listen [::]:${NGINX_PORT};
server_name localhost;

root /var/www/html/public;
root ${NGINX_WEB_ROOT};
index index.php index.html;

# Health check endpoint
Expand Down
Loading