fix: check for password file presence to build db url

fix: typo
feat: set db type
2025-04-11 17:02:46 -03:00 · 2025-04-11 17:01:25 -03:00 · 2025-04-11 17:00:56 -03:00 · 2025-04-10 15:42:21 -03:00 · 2025-04-10 09:50:06 -03:00 · 2025-04-10 09:26:42 -03:00
4 changed files with 8 additions and 6 deletions
@@ -1,2 +1,2 @@
-export ENTRYPOINT_CONF_VERSION=v11
+export ENTRYPOINT_CONF_VERSION=v12
 export PG_BACKUP_VERSION=v1
@@ -2,7 +2,7 @@ version: "3.8"
 services:
  app:
    environment:
-      - POSTGRES_ENABLED=1
+      - CMD_DB_TYPE=postgres
      - CMD_DB_NAME=codimd
      - CMD_DB_USER=codimd
      - CMD_DB_HOST=db
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
  app:
-    image: quay.io/hedgedoc/hedgedoc:1.10.1
+    image: quay.io/hedgedoc/hedgedoc:1.10.3
    environment:
      - CMD_USECDN=false
      - CMD_URL_ADDPORT=false
@@ -22,7 +22,9 @@ file_env() {
 }

 load_vars() {
-  file_env "CMD_DB_PASSWORD"
+  if [ -n "${CMD_DB_PASSWORD_FILE:-""}" ] ; then
+    file_env "CMD_DB_PASSWORD"
+  fi
  file_env "CMD_OAUTH2_CLIENT_SECRET"
  file_env "CMD_SESSION_SECRET"
 }
@@ -40,8 +42,8 @@ main() {

 main

-if [ -n "$POSTGRES_ENABLED" ]; then
-export CMD_DB_URL="postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME"
+if [ -n "${CMD_DB_PASSWORD_FILE:-""}" ] ; then
+  export CMD_DB_URL="${CMD_DB_TYPE}://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME"
 fi

 # 3wc: `source /docker-entrypoint.sh -e` to load CMD_DB_URL for CLI scripts
Author	SHA1	Message	Date
fauno	29968706fc	fix: check for password file presence to build db url continuous-integration/drone/pr Build is failing Details	2025-04-11 17:02:46 -03:00
fauno	1db30e2cda	fix: typo	2025-04-11 17:01:25 -03:00
fauno	ec1735a005	feat: set db type	2025-04-11 17:00:56 -03:00
fauno	29a7d585dc	fix: provide default values for variables continuous-integration/drone/pr Build is failing Details	2025-04-10 15:42:21 -03:00
fauno	d0191f1c49	fix: prevent unbound variable error continuous-integration/drone/pr Build is failing Details	2025-04-10 09:50:06 -03:00
fauno	58bfa65b8a	fix: security upgrade https://github.com/hedgedoc/hedgedoc/security/advisories/GHSA-3983-rrqh-mvx5	2025-04-10 09:26:42 -03:00