From 90d7a8a98977fb5add511389f23352c60e40e9e9 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 15 Jul 2022 10:36:34 +0200
Subject: [PATCH] configuring docker
---
ldvspec/Dockerfile | 9 ++++++---
ldvspec/docker/docker-compose-dev-cd.yml | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ldvspec/Dockerfile b/ldvspec/Dockerfile
index d2bf1ae9..42084e8d 100644
--- a/ldvspec/Dockerfile
+++ b/ldvspec/Dockerfile
@@ -10,9 +10,12 @@ RUN \
apk add --no-cache python3 postgresql-libs && \
apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev postgresql-dev && \
pip install -r requirements/prod.txt && \
- apk --purge del .build-deps \
- python manage.py collectstatic --settings=ldvspec.settings.docker_sdc \
- python manage.py migrate --settings=ldvspec.settings.docker_sdc \
+ apk --purge del .build-deps
+
+# collect the static files and make sure that the latest database migrations are done
+CMD \
+ python manage.py collectstatic --settings=ldvspec.settings.docker_sdc && \
+ python manage.py migrate --settings=ldvspec.settings.docker_sdc
# run gunicorn
CMD exec gunicorn ldvspec.wsgi_docker_sdc:application --bind 0.0.0.0:8000 --workers 4
diff --git a/ldvspec/docker/docker-compose-dev-cd.yml b/ldvspec/docker/docker-compose-dev-cd.yml
index 3ee72bcb..877b3d15 100644
--- a/ldvspec/docker/docker-compose-dev-cd.yml
+++ b/ldvspec/docker/docker-compose-dev-cd.yml
@@ -8,9 +8,9 @@ networks:
driver: bridge
services:
- postgres-ldvspec:
+ ldv-spec-db:
image: postgres:14
- container_name: postgres-ldvspec
+ container_name: ldv-spec-postgres
expose:
- 12000:5432
#ports:
@@ -42,7 +42,7 @@ services:
- "traefik.http.services.ldv-specification.loadbalancer.server.port=8000"
depends_on:
- - postgres-ldvspec
+ - ldv-spec-db
env_file:
- $HOME/shared/ldvspec.env
restart: always
--
GitLab