From 3406563568b36c3bce43b10892c335f08ae18331 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 15 Jul 2022 11:54:57 +0200
Subject: [PATCH] configuring docker
---
README.md | 6 ++++--
ldvspec/Dockerfile | 1 +
ldvspec/docker/docker-compose-dev-cd.yml | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 23c45353..07de7ffe 100644
--- a/README.md
+++ b/README.md
@@ -34,11 +34,13 @@ git push -uf origin main
## Howto
-### migrate database
+### migrate database manually
+
+- exec into the container
```
cd /src
-python manage.py migrate --settings=ldvspec.settings
+python manage.py migrate --settings=ldvspec.settings.docker_sdc
```
***
diff --git a/ldvspec/Dockerfile b/ldvspec/Dockerfile
index 42084e8d..9ff9050d 100644
--- a/ldvspec/Dockerfile
+++ b/ldvspec/Dockerfile
@@ -14,6 +14,7 @@ RUN \
# collect the static files and make sure that the latest database migrations are done
CMD \
+ cd /src && \
python manage.py collectstatic --settings=ldvspec.settings.docker_sdc && \
python manage.py migrate --settings=ldvspec.settings.docker_sdc
diff --git a/ldvspec/docker/docker-compose-dev-cd.yml b/ldvspec/docker/docker-compose-dev-cd.yml
index ab1560ba..1c581c8c 100644
--- a/ldvspec/docker/docker-compose-dev-cd.yml
+++ b/ldvspec/docker/docker-compose-dev-cd.yml
@@ -14,6 +14,7 @@ services:
expose:
- 5432
ports:
+ # enables an external database connection to sdc-dev.astron.nl:12000
- 12000:5432
networks:
- traefik_proxy
@@ -25,7 +26,7 @@ services:
restart: always
ldv-specification:
- container_name: ldvspec
+ container_name: ldv-specification
image: git.astron.nl:5000/astron-sdc/ldv-specification:latest
expose:
@@ -35,7 +36,6 @@ services:
- ldv_network
labels:
- "traefik.enable=true"
- #- "traefik.http.routers.ldv-specification.entryPoints=ldvspec"
- "traefik.http.routers.ldv-specification.entryPoints=websecure"
- "traefik.http.routers.ldv-specification.service=ldv-specification"
- "traefik.http.routers.ldv-specification.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/ldvspec`)"
--
GitLab