Merge pull request #18 from geniusdynamics/dev

Dev

Author: kemboi22

imageroot/actions/create-module/10configure_environment_vars

@@ -41,6 +41,7 @@ POSTGRES_USER_USERNAME = "zitadel"
 POSTGRES_USER_PASSWORD = generate_random_password()
 
 postgres_config = {
+    "POSTGRES_DB": POSTGRES_DB,
     "POSTGRES_USER": POSTGRES_USER,
     "POSTGRES_PASSWORD": POSTGRES_PASSWORD,
 }

imageroot/actions/restore-module/40restore-postgres

@@ -8,28 +8,28 @@
 set -e -o pipefail
 exec 1>&2 # Redirect any output to the journal (stderr)
 
-mkdir -vp restore
-cat - >restore/zitadel_restore.sh <<'EOS'
-# Read dump file from standard input:
-pg_restore --no-owner --no-privileges -U postgres -d zitadel
-ec=$?
-docker_temp_server_stop
-exit $ec
-EOS
+# mkdir -vp restore
+# cat - >restore/zitadel_restore.sh <<'EOS'
+# # Read dump file from standard input:
+# pg_restore  -U postgres -d zitadel
+# ec=$?
+# docker_temp_server_stop
+# exit $ec
+# EOS
 
 # Override the image /docker-entrypoint-initdb.d contents, to restore the
 # DB dump file. The container will be stopped at the end
 
-podman run \
-    --rm \
-    --interactive \
-    --network=none \
-    --volume=./restore:/docker-entrypoint-initdb.d/:Z \
-    --volume=postgres-data:/var/lib/postgresql/data:Z \
-    --replace --name=restore_db \
-    --env-file=database.env \
-    --env TZ=UTC \
-    "${POSTGRES_IMAGE}" <  zitadel.pg_dump
-
-# If the restore is successful, clean up:
-rm -rfv restore/  zitadel.pg_dump
+# podman run \
+# 	--rm \
+# 	--interactive \
+# 	--network=none \
+# 	--volume=./restore:/docker-entrypoint-initdb.d/:Z \
+# 	--volume=postgres-data:/var/lib/postgresql/data:Z \
+# 	--replace --name=restore_db \
+# 	--env-file=database.env \
+# 	--env TZ=UTC \
+# 	"${POSTGRES_IMAGE}" <zitadel.pg_dump
+#
+# # If the restore is successful, clean up:
+# rm -rfv restore/ zitadel.pg_dump

imageroot/etc/state-include.conf

@@ -9,4 +9,5 @@ state/smarthost.env
 state/zitadel.env
 state/zitadel-app.env
 state/database.env
-state/zitadel.pg_dump
+state/zitadel.pg_dump
+volumes/postgres-data