chore: publish 3.0.1+1.10.3 release

Reviewed-on: https://git.coopcloud.tech/coop-cloud/hedgedoc/pulls/17
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>

abra.sh

@@ -1,2 +1,2 @@
-export ENTRYPOINT_CONF_VERSION=v11
+export ENTRYPOINT_CONF_VERSION=v12
 export PG_BACKUP_VERSION=v1

compose.postgresql.yml

@@ -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

compose.yml

@@ -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
@@ -54,7 +54,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-        - "coop-cloud.${STACK_NAME}.version=3.0.0+1.10.1"
+        - "coop-cloud.${STACK_NAME}.version=3.0.1+1.10.3"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
     healthcheck:
       test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""

entrypoint.sh.tmpl

@@ -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

release/3.0.1+1.10.3

@@ -0,0 +1 @@
+Security upgrade for GHSA-3983-rrqh-mvx5