Move storage locations to {VOLUME_PATH}/{COMPOSE_STACK_NAME}/{SERVICE_NAME} schema

This commit is contained in:
Florian Zirker 2023-06-05 14:57:29 +02:00
parent 922b97710f
commit 23903d003d
5 changed files with 19 additions and 19 deletions

View file

@ -3,7 +3,7 @@ services:
syncserver: syncserver:
image: mozilla/syncserver:latest image: mozilla/syncserver:latest
volumes: volumes:
- ${VOLUMES_PATH}/firefoxsync_syncserver:/data - ${VOLUMES_PATH}/firefoxsync/syncserver:/data
user: ${UID}:${GID} user: ${UID}:${GID}
networks: networks:
- web - web
@ -23,7 +23,7 @@ services:
- SYNCSERVER_SQLURI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB} - SYNCSERVER_SQLURI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}
- SYNCSERVER_BATCH_UPLOAD_ENABLED=true - SYNCSERVER_BATCH_UPLOAD_ENABLED=true
- SYNCSERVER_FORCE_WSGI_ENVIRON=true - SYNCSERVER_FORCE_WSGI_ENVIRON=true
- SYNCSERVER_DEBUG_ENABLED=true - SYNCSERVER_DEBUG_ENABLED=false
- SYNCSERVER_ALLOW_NEW_USER=true - SYNCSERVER_ALLOW_NEW_USER=true
- PORT=5000 - PORT=5000
@ -38,7 +38,7 @@ services:
networks: networks:
- firefoxsync - firefoxsync
volumes: volumes:
- ${VOLUMES_PATH}/firefoxsync_db:/var/lib/postgresql/data - ${VOLUMES_PATH}/firefoxsync/db:/var/lib/postgresql/data
user: ${UID}:${GID} user: ${UID}:${GID}
labels: labels:
- "docker.group=firefoxsync" - "docker.group=firefoxsync"

View file

@ -39,7 +39,7 @@ services:
grafanadb: grafanadb:
image: postgres:${POSTGRES_VERSION} image: postgres:${POSTGRES_VERSION}
volumes: volumes:
- ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data - ${VOLUMES_PATH}/monitoring/grafanadb:/var/lib/postgresql/data
networks: networks:
- grafana - grafana
restart: unless-stopped restart: unless-stopped
@ -61,7 +61,7 @@ services:
environment: environment:
- INFLUXDB_MONITOR_STORE_ENABLED=false - INFLUXDB_MONITOR_STORE_ENABLED=false
volumes: volumes:
- ${VOLUMES_PATH}/influxdb/:/var/lib/influxdb - ${VOLUMES_PATH}/monitoring/influxdb/:/var/lib/influxdb
- ${PWD}/influxdb.conf:/etc/influxdb/influxdb.conf:ro - ${PWD}/influxdb.conf:/etc/influxdb/influxdb.conf:ro
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@ -84,7 +84,7 @@ services:
- web # also used to get traefik metrics - web # also used to get traefik metrics
volumes: volumes:
- ./prometheus.yml:/etc/prometheus/prometheus.yml - ./prometheus.yml:/etc/prometheus/prometheus.yml
- ${VOLUMES_PATH}/prometheus:/prometheus - ${VOLUMES_PATH}/monitoring/prometheus:/prometheus
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"

View file

@ -5,7 +5,7 @@ services:
depends_on: depends_on:
- app - app
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html:ro - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro
- $PWD/nginx.conf:/etc/nginx/nginx.conf:ro - $PWD/nginx.conf:/etc/nginx/nginx.conf:ro
restart: unless-stopped restart: unless-stopped
networks: networks:
@ -34,8 +34,8 @@ services:
args: args:
- NC_MAIN_VERSION=${NC_MAIN_VERSION} - NC_MAIN_VERSION=${NC_MAIN_VERSION}
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html - ${VOLUMES_PATH}/nextcloud/html:/var/www/html
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data
- type: tmpfs - type: tmpfs
target: /tmp target: /tmp
restart: unless-stopped restart: unless-stopped
@ -66,8 +66,8 @@ services:
networks: networks:
- nextcloud - nextcloud
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html - ${VOLUMES_PATH}/nextcloud/html:/var/www/html
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data
# If I mount my crontab into the container crond is not working any more :( # If I mount my crontab into the container crond is not working any more :(
# docker log should print 11110001 lines # docker log should print 11110001 lines
# https://github.com/nextcloud/docker/issues/1775 # https://github.com/nextcloud/docker/issues/1775
@ -91,8 +91,8 @@ services:
- web - web
- nextcloud - nextcloud
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_html:/var/www/html:ro - ${VOLUMES_PATH}/nextcloud/html:/var/www/html:ro
- ${VOLUMES_PATH}/nextcloud_data:/var/www/html/data:ro - ${VOLUMES_PATH}/nextcloud/data:/var/www/html/data:ro
environment: environment:
- PORT=7867 - PORT=7867
- NEXTCLOUD_URL=http://web - NEXTCLOUD_URL=http://web
@ -113,7 +113,7 @@ services:
image: mariadb:10 image: mariadb:10
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_db:/var/lib/mysql - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql
restart: unless-stopped restart: unless-stopped
environment: environment:
- PUID=1000 - PUID=1000
@ -165,7 +165,7 @@ services:
- nextcloud - nextcloud
- monitoring - monitoring
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_redis:/data - ${VOLUMES_PATH}/nextcloud/redis:/data
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
@ -205,7 +205,7 @@ services:
networks: networks:
- nextcloud - nextcloud
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud_fonts:/usr/share/fonts/drawio - ${VOLUMES_PATH}/nextcloud/fonts:/usr/share/fonts/drawio
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"

View file

@ -40,7 +40,7 @@ services:
- web - web
- dockersocket - dockersocket
volumes: volumes:
- ${VOLUMES_PATH}/letsencrypt:/letsencrypt - ${VOLUMES_PATH}/proxy/letsencrypt:/letsencrypt
- $PWD/tls.toml:/etc/traefik/tls.toml - $PWD/tls.toml:/etc/traefik/tls.toml
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"

View file

@ -20,7 +20,7 @@ services:
- web - web
- wallabag - wallabag
volumes: volumes:
- /var/dockervolumes/wallabag_images:/var/www/wallabag/web/assets/images - /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.wallabag.rule=Host(`wallabag.${DOMAIN}`)" - "traefik.http.routers.wallabag.rule=Host(`wallabag.${DOMAIN}`)"
@ -40,7 +40,7 @@ services:
networks: networks:
- wallabag - wallabag
volumes: volumes:
- /var/dockervolumes/wallabag_db:/var/lib/mysql - /var/dockervolumes/wallabag/db:/var/lib/mysql
labels: labels:
- "docker.group=wallabag" - "docker.group=wallabag"