fix localdev and rebuild

DSAV-Dodeka · Dec 5, 2023 · 5d0f6de · 5d0f6de
1 parent db73b7c
commit 5d0f6de
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 12 deletions.
diff --git a/build/deploy/dev/confspawn_dev.env b/build/deploy/dev/confspawn_dev.env
@@ -1,6 +1,7 @@
 # The docker compose project name
 COMPOSE_PROJECT_NAME={{ main.project }}
 NETWORK_NAME={{ main.docker_net_name }}
+DEPLOY_NAME={{ confspawn_env.name }}
 
 # This .env file contains environment variables used during deployment
 # The host port will be the port that the host will open, i.e. what nginx will connect to. Hostname defined by HOST_HOST
@@ -34,4 +35,12 @@ SERVER_HOST_PORT={{ server.host_port }}
 COMCOM_MAIL_PASS=""
 KEY_PASSWORD="AT_av0v62Z3hQH50VYwKBks1-VSukK9xDN_Ur34mdZ4"
 
+SERVER_DB_HOST="{{ db.container_name }}-{{ confspawn_env.name }}"
+SERVER_DB_PORT="{{ db.container_port }}"
+SERVER_KV_HOST="{{ kv.container_name }}-{{ confspawn_env.name }}"
+SERVER_KV_PORT="{{ kv.container_port }}"
+SERVER_MAIL_ENABLED ="{{ confspawn_env.mail_enabled }}"
+SERVER_SMTP_SERVER ="{{ confspawn_env.smtp_server }}"
+SERVER_SMTP_PORT ="{{ server.smtp_port }}"
+
 RECREATE=no
diff --git a/build/deploy/dev/confspawn_dev_port.env b/build/deploy/dev/confspawn_dev_port.env
@@ -34,4 +34,12 @@ SERVER_HOST_PORT={{ server.host_port }}
 COMCOM_MAIL_PASS=""
 KEY_PASSWORD="AT_av0v62Z3hQH50VYwKBks1-VSukK9xDN_Ur34mdZ4"
 
+SERVER_DB_HOST="{{ db.container_name }}-{{ confspawn_env.name }}"
+SERVER_DB_PORT="{{ db.container_port }}"
+SERVER_KV_HOST="{{ kv.container_name }}-{{ confspawn_env.name }}"
+SERVER_KV_PORT="{{ kv.container_port }}"
+SERVER_MAIL_ENABLED ="{{ confspawn_env.mail_enabled }}"
+SERVER_SMTP_SERVER ="{{ confspawn_env.smtp_server }}"
+SERVER_SMTP_PORT ="{{ server.smtp_port }}"
+
 RECREATE=no
diff --git a/config.toml b/config.toml
@@ -51,8 +51,8 @@ realm="dodeka"
 
 [confspawn_env.production]
 name = "production"
-version = "v2.1.0"
-git_ref = "v2.1.0"
+version = "v2.1.1"
+git_ref = "v2.1.1"
 allowed_envs = "\"production\""
 # Only the credentials url is with trailing slash, the rest should all be without
 api_root = "https://api.dsavdodeka.nl"
@@ -65,7 +65,7 @@ mail_enabled = true
 
 [confspawn_env.staging]
 name = "staging"
-version = "v2.1.0-rc.2"
+version = "v2.1.1"
 git_ref = "main"
 allowed_envs = "\"staging\""
 api_root = "https://apidemo.tipten.nl"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dodeka"
-version = "2.1.0"
+version = "2.1.1"
 description = ""
 authors = ["Tip ten Brink <[email protected]>"]
 

diff --git a/use/data_sync/migrate_env.sh b/use/data_sync/migrate_env.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-poetry run python -c "from use.data_sync.migrate import download_migration_env; download_migration_env('v2.1.0')" || exit 1
+poetry run python -c "from use.data_sync.migrate import download_migration_env; download_migration_env('v2.1.1')" || exit 1
 cp use/data_sync/connect.json migrate/connect.json
diff --git a/use/dev/dev.env b/use/dev/dev.env
@@ -1,6 +1,7 @@
 # The docker compose project name
 COMPOSE_PROJECT_NAME=dodeka
 NETWORK_NAME=dodeka
+DEPLOY_NAME=localdev
 
 # This .env file contains environment variables used during deployment
 # The host port will be the port that the host will open, i.e. what nginx will connect to. Hostname defined by HOST_HOST
@@ -34,4 +35,12 @@ SERVER_HOST_PORT=4241
 COMCOM_MAIL_PASS=""
 KEY_PASSWORD="AT_av0v62Z3hQH50VYwKBks1-VSukK9xDN_Ur34mdZ4"
 
+SERVER_DB_HOST="dodeka-db-localdev"
+SERVER_DB_PORT="3141"
+SERVER_KV_HOST="dodeka-kv-localdev"
+SERVER_KV_PORT="6379"
+SERVER_MAIL_ENABLED ="False"
+SERVER_SMTP_SERVER ="mail.dsavdodeka.nl"
+SERVER_SMTP_PORT ="587"
+
 RECREATE=no
diff --git a/use/dev/dev_port.env b/use/dev/dev_port.env
@@ -34,4 +34,12 @@ SERVER_HOST_PORT=4241
 COMCOM_MAIL_PASS=""
 KEY_PASSWORD="AT_av0v62Z3hQH50VYwKBks1-VSukK9xDN_Ur34mdZ4"
 
+SERVER_DB_HOST="dodeka-db-localdev"
+SERVER_DB_PORT="3141"
+SERVER_KV_HOST="dodeka-kv-localdev"
+SERVER_KV_PORT="6379"
+SERVER_MAIL_ENABLED ="False"
+SERVER_SMTP_SERVER ="mail.dsavdodeka.nl"
+SERVER_SMTP_PORT ="587"
+
 RECREATE=no
diff --git a/use/production/production.env b/use/production/production.env
@@ -32,9 +32,9 @@ SERVER_SMTP_SERVER ="host.docker.internal"
 SERVER_SMTP_PORT ="587"
 
 # Docker tag versions
-KV_VERSION=v2.1.0
-DB_VERSION=v2.1.0
-SERVER_VERSION=v2.1.0
+KV_VERSION=v2.1.1
+DB_VERSION=v2.1.1
+SERVER_VERSION=v2.1.1
 
 # The following are not specified and should be specified in a script:
 # - COMCOM_MAIL_PASS

diff --git a/use/production/tidploy.toml b/use/production/tidploy.toml
@@ -1,5 +1,5 @@
 [info]
-latest = "v2.1.0"
+latest = "v2.1.1"
 
 [secrets]
 ids = [

diff --git a/use/staging/staging.env b/use/staging/staging.env
@@ -33,9 +33,9 @@ SERVER_SMTP_PORT ="587"
 
 # Docker tag versions
 # In practice for staging you will want to override these
-KV_VERSION=v2.1.0-rc.2
-DB_VERSION=v2.1.0-rc.2
-SERVER_VERSION=v2.1.0-rc.2
+KV_VERSION=v2.1.1
+DB_VERSION=v2.1.1
+SERVER_VERSION=v2.1.1
 
 # The following are not specified and should be specified in a script:
 # - COMCOM_MAIL_PASS