chore: publish 3.0.1+1.10.3 release

Merge pull request 'security upgrade' (#17 ) from upgrade into main
Reviewed-on: #17 Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
2025-04-23 16:48:57 -03:00 · 2025-04-23 19:46:19 +00:00 · 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
5 changed files with 10 additions and 7 deletions
--- a/abra.sh
+++ b/abra.sh
@ -1,2 +1,2 @@
-export ENTRYPOINT_CONF_VERSION=v11
+export ENTRYPOINT_CONF_VERSION=v12
 export PG_BACKUP_VERSION=v1
--- a/compose.postgresql.yml
+++ b/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
--- a/compose.yml
+++ b/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); } });\""
--- a/entrypoint.sh.tmpl
+++ b/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
--- a/release/3.0.1+1.10.3
+++ b/release/3.0.1+1.10.3
@ -0,0 +1 @@
+Security upgrade for GHSA-3983-rrqh-mvx5
Author	SHA1	Message	Date
f	660a5fee21	chore: publish 3.0.1+1.10.3 release Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/tag Build is passing Details	2025-04-23 16:48:57 -03:00
fauno	8d23542076	Merge pull request 'security upgrade' (#17 ) from upgrade into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #17 Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>	2025-04-23 19:46:19 +00:00
f	29968706fc	fix: check for password file presence to build db url Some checks failed continuous-integration/drone/pr Build is failing Details	2025-04-11 17:02:46 -03:00
f	1db30e2cda	fix: typo	2025-04-11 17:01:25 -03:00
f	ec1735a005	feat: set db type	2025-04-11 17:00:56 -03:00
f	29a7d585dc	fix: provide default values for variables Some checks failed continuous-integration/drone/pr Build is failing Details	2025-04-10 15:42:21 -03:00
f	d0191f1c49	fix: prevent unbound variable error Some checks failed continuous-integration/drone/pr Build is failing Details	2025-04-10 09:50:06 -03:00
f	58bfa65b8a	fix: security upgrade https://github.com/hedgedoc/hedgedoc/security/advisories/GHSA-3983-rrqh-mvx5	2025-04-10 09:26:42 -03:00