++ fix network & other

This commit is contained in:
2026-03-16 11:09:43 +01:00
parent 5bf3072185
commit cbbe08662d
2 changed files with 19 additions and 13 deletions

8
.env
View File

@@ -1,12 +1,18 @@
PROJECT_NAME=drive
RESTART=unless-stopped
TZ=Europe/Rome TZ=Europe/Rome
NEXTCLOUD_DOMAIN=drive.pyconetwork.it NEXTCLOUD_DOMAIN=drive.pyconetwork.it
NEXTCLOUD_DOMAIN_REGEX=drive\\.pyconetwork\\.it NEXTCLOUD_DOMAIN_REGEX=drive\\.pyconetwork\\.it
TRUSTED_PROXY_IP=192.168.4.4 TRUSTED_PROXY_IP=192.168.4.4
TRUSTED_PROXIES=192.168.4.4 172.30.0.10 TRUSTED_PROXIES=${TRUSTED_PROXY_IP} ${NGINX_IP_ADDRESS}
# Unica porta pubblicata sul nodo Docker: il reverse proxy punta a nginx. # Unica porta pubblicata sul nodo Docker: il reverse proxy punta a nginx.
NGINX_PORT=8383 NGINX_PORT=8383
NGINX_IP_ADDRESS=172.40.0.10
NGINX_NETWORK=172.40.0.0/24
MYSQL_DATABASE=nextcloud MYSQL_DATABASE=nextcloud
MYSQL_USER=nextcloud MYSQL_USER=nextcloud

View File

@@ -1,8 +1,8 @@
services: services:
nginx: nginx:
image: nginx:1.27-alpine image: nginx:1.27-alpine
container_name: nextcloud-nginx container_name: ${PROJECT_NAME}-nextcloud-nginx
restart: unless-stopped restart: ${RESTART}
depends_on: depends_on:
- app - app
- collabora - collabora
@@ -12,12 +12,12 @@ services:
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
networks: networks:
nextcloud_internal: nextcloud_internal:
ipv4_address: 172.30.0.10 ipv4_address: ${NGINX_IP_ADDRESS}
db: db:
image: mariadb:11.4 image: mariadb:11.4
container_name: nextcloud-db container_name: ${PROJECT_NAME}-nextcloud-db
restart: unless-stopped restart: ${RESTART}
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
environment: environment:
MYSQL_DATABASE: ${MYSQL_DATABASE} MYSQL_DATABASE: ${MYSQL_DATABASE}
@@ -32,16 +32,16 @@ services:
redis: redis:
image: redis:7-alpine image: redis:7-alpine
container_name: nextcloud-redis container_name: ${PROJECT_NAME}-nextcloud-redis
restart: unless-stopped restart: ${RESTART}
command: redis-server --requirepass ${REDIS_PASSWORD} command: redis-server --requirepass ${REDIS_PASSWORD}
networks: networks:
- nextcloud_internal - nextcloud_internal
app: app:
image: nextcloud:apache image: nextcloud:apache
container_name: nextcloud-app container_name: ${PROJECT_NAME}-nextcloud-app
restart: unless-stopped restart: ${RESTART}
depends_on: depends_on:
- db - db
- redis - redis
@@ -69,8 +69,8 @@ services:
collabora: collabora:
image: collabora/code:latest image: collabora/code:latest
container_name: collabora container_name: ${PROJECT_NAME}-collabora
restart: unless-stopped restart: ${RESTART}
expose: expose:
- "9980" - "9980"
environment: environment:
@@ -94,4 +94,4 @@ networks:
driver: bridge driver: bridge
ipam: ipam:
config: config:
- subnet: 172.30.0.0/24 - subnet: ${NGINX_NETWORK}