Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make docker volume paths configurable. #378

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
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
8 changes: 7 additions & 1 deletion .env.docker
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

# This should point to a folder with the following subfolders:
# - postgres-data
# - pgadmin-data
# - django-data
VOLUME_DIR=/path/to/where/all/volume/data/should/be/stored

HOST=localhost

DB_NAME=esid_api
Expand All @@ -15,4 +21,4 @@ PGADMIN_PASSWORD=root

# Frontend
ESID_PORT=8080
ESID_BRANCH=latest
ESID_BRANCH=latest
6 changes: 6 additions & 0 deletions backend/.env.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

# This should point to a folder with the following subfolders:
# - postgres-data
# - pgadmin-data
# - django-data
VOLUME_DIR=/path/to/where/all/volume/data/should/be/stored

####################################
# Django setup #
####################################
Expand Down
6 changes: 3 additions & 3 deletions backend/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
PGDATA: /data/postgres
volumes:
- postgres-data:/data/postgres
- ${VOLUME_DIR}/postgres-data:/data/postgres

backend:
build:
Expand All @@ -36,7 +36,7 @@ services:
SITE_URL: 'http://localhost:8000'
command: 'sh -c "python manage.py migrate && python manage.py collectstatic --no-input && python manage.py runserver 0.0.0.0:8000"'
volumes:
- django-data:/localdata
- ${VOLUME_DIR}/django-data:/localdata
- ./:/app
depends_on:
- db
Expand All @@ -50,7 +50,7 @@ services:
ports:
- '5050:80'
volumes:
- pgadmin-data:/var/lib/pgadmin
- ${VOLUME_DIR}/pgadmin-data:/var/lib/pgadmin
depends_on:
- db

Expand Down
6 changes: 3 additions & 3 deletions backend/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
PGDATA: /data/postgres
volumes:
- postgres-data:/data/postgres
- ${VOLUME_DIR}/postgres-data:/data/postgres

backend:
image: esid/backend:latest
Expand All @@ -35,7 +35,7 @@ services:
ports:
- 8000:8000
volumes:
- django-data:/localdata
- ${VOLUME_DIR}/django-data:/localdata
depends_on:
- db

Expand All @@ -48,7 +48,7 @@ services:
ports:
- '5050:80'
volumes:
- pgadmin-data:/var/lib/pgadmin
- ${VOLUME_DIR}/pgadmin-data:/var/lib/pgadmin
depends_on:
- db

Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
PGDATA: /data/postgres
volumes:
- postgres-data:/data/postgres
- ${VOLUME_DIR}/postgres-data:/data/postgres

pgadmin:
image: dpage/pgadmin4:latest
Expand All @@ -23,7 +23,7 @@ services:
ports:
- 5050:80
volumes:
- pgadmin-data:/var/lib/pgadmin
- ${VOLUME_DIR}/pgadmin-data:/var/lib/pgadmin
depends_on:
- db

Expand All @@ -45,7 +45,7 @@ services:
ports:
- 8000:8000
volumes:
- django-data:/localdata
- ${VOLUME_DIR}/django-data:/localdata
depends_on:
- db

Expand All @@ -63,10 +63,10 @@ services:
depends_on:
- backend

volumes:
django-data:
external: True
postgres-data:
external: True
pgadmin-data:
external: True
#volumes:
# django-data:
# external: True
# postgres-data:
# external: True
# pgadmin-data:
# external: True
Loading