Remove unused volumes from production and add them in overrides

Unused volume mounts were removed from the main `docker-compose.yml` file to simplify the production configuration. Development and override files were updated to include relevant volume mounts where needed, ensuring appropriate environment-specific setups.
main
Arne Schauf 2 weeks ago
parent d4c66b1e55
commit c3fa6104f5
  1. 11
      docker-compose.dev.override.yml
  2. 6
      docker-compose.prod.override.yml
  3. 9
      docker-compose.yml

@ -7,6 +7,9 @@ services:
replicas: 1 replicas: 1
environment: environment:
DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev
volumes:
- .:/app
- userhome:/home/runuser
ports: ports:
- "8000:8000" - "8000:8000"
depends_on: depends_on:
@ -25,11 +28,19 @@ services:
manage: manage:
deploy: deploy:
replicas: 0 replicas: 0
volumes:
- .:/app
- userhome:/home/runuser
environment: environment:
DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev DJANGO_SETTINGS_MODULE: feo_homepage.settings.dev
depends_on: depends_on:
- db - db
celery:
volumes:
- .:/app
- userhome:/home/runuser
mailhog: mailhog:
image: mailhog/mailhog image: mailhog/mailhog
ports: ports:

@ -25,6 +25,12 @@ services:
- default - default
- db - db
celery:
restart: unless-stopped
volumes:
- /mnt/data/feo-homepage/static:/app/static
- /mnt/data/feo-homepage/media:/app/media
nginx: nginx:
image: nginx:1.23 image: nginx:1.23
volumes: volumes:

@ -12,9 +12,6 @@ services:
mode: replicated mode: replicated
replicas: 6 replicas: 6
endpoint_mode: vip endpoint_mode: vip
volumes:
- .:/app
- userhome:/home/runuser
env_file: env_file:
- .env - .env
environment: environment:
@ -31,9 +28,6 @@ services:
entrypoint: entrypoint:
- "./manage.py" - "./manage.py"
command: "collectstatic --no-input" command: "collectstatic --no-input"
volumes:
- .:/app
- userhome:/home/runuser
env_file: env_file:
- .env - .env
environment: environment:
@ -52,9 +46,6 @@ services:
environment: environment:
PYTHONDONTWRITEBYTECODE: 1 PYTHONDONTWRITEBYTECODE: 1
DJANGO_SETTINGS_MODULE: feo_homepage.settings.prod DJANGO_SETTINGS_MODULE: feo_homepage.settings.prod
volumes:
- .:/app
- userhome:/home/uid1000
env_file: env_file:
- .env - .env
depends_on: depends_on:

Loading…
Cancel
Save