From 02ad71762db86bece8c877a6ae5be7b3262ae8fb Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 09:50:51 +0100 Subject: [PATCH 1/6] Correct image name --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f9195a2..c733c28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,8 @@ services: - ./db_data:/var/lib/postgresql/data/ web: - image: ghcr.io/nebucatnetzer/network_inventory/network_inventory:master # build: . + image: ghcr.io/nebucatnetzer/network_inventory/network-inventory volumes: - .:/code environment: From 21ff8e674c0556bce8002678b419e81b460ba00b Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 09:51:13 +0100 Subject: [PATCH 2/6] Correct static volume --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c733c28..7e5f054 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: # build: . image: ghcr.io/nebucatnetzer/network_inventory/network-inventory volumes: - - .:/code + - ./static/:/code/static environment: - DJANGO_SETTINGS_MODULE - DJANGO_DEBUG From c59e3d95fd449b41b94082c709c95dde2bed65af Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 09:51:22 +0100 Subject: [PATCH 3/6] Remove unused command --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7e5f054..01948f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: - ./db_data:/var/lib/postgresql/data/ web: - # build: . image: ghcr.io/nebucatnetzer/network_inventory/network-inventory volumes: - ./static/:/code/static From 7c874f6ae8bfafbfa47fc6fb837ed94b18b0eaa7 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 09:51:34 +0100 Subject: [PATCH 4/6] Ignore the static folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b0ca371..872fc7f 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,4 @@ htmlcov/ db_data .direnv /result +/static/ From 0a669d7e88180a8487dacb512f39b23dae8bf315 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 10:07:29 +0100 Subject: [PATCH 5/6] Correct name for SECRET_KEY env --- src/network_inventory/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network_inventory/settings/production.py b/src/network_inventory/settings/production.py index bf2f859..ed196eb 100644 --- a/src/network_inventory/settings/production.py +++ b/src/network_inventory/settings/production.py @@ -15,7 +15,7 @@ ALLOWED_HOSTS = [ ] # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv("SECRET_KEY") +SECRET_KEY = os.getenv("DJANGO_SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False From 12e72e269850e551937ebfbdcd8d27c525b7e0b3 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Mon, 12 Dec 2022 10:07:58 +0100 Subject: [PATCH 6/6] Get the postgres password from the env variable --- docker-compose.yml | 1 + src/network_inventory/settings/production.py | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 01948f4..2d49a69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,7 @@ services: - DJANGO_SETTINGS_MODULE - DJANGO_DEBUG - DJANGO_SECRET_KEY + - "DJANGO_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" depends_on: - db diff --git a/src/network_inventory/settings/production.py b/src/network_inventory/settings/production.py index ed196eb..4b871d6 100644 --- a/src/network_inventory/settings/production.py +++ b/src/network_inventory/settings/production.py @@ -26,6 +26,7 @@ DATABASES = { "ENGINE": "django.db.backends.postgresql", "NAME": "postgres", "USER": "postgres", + "PASSWORD": os.environ.get("DJANGO_POSTGRES_PASSWORD"), "HOST": "db", "PORT": 5432, }