fix: pass "-p" and use new lines

Closes #13

.env.sample

@@ -1,4 +1,6 @@
 TYPE=hedgedoc
+TIMEOUT=300
+ENABLE_AUTO_UPDATE=true
 
 DOMAIN=hedgedoc.example.com
 ## Domain aliases

README.md

@@ -7,9 +7,9 @@
 <!-- metadata -->
 * **Category**: Apps
 * **Status**: 2, beta
-* **Image**: [`quay.io/hedgedoc/hedgedoc:1.8.2`](https://quay.io/hedgedoc/hedgedoc:1.8.2), 4, upstream
+* **Image**: [`quay.io/hedgedoc/hedgedoc`](https://quay.io/hedgedoc/hedgedoc), 4, upstream
 * **Healthcheck**: Yes
-* **Backups**: No
+* **Backups**: Yes
 * **Email**: No
 * **Tests**: 2
 * **SSO**: 3 (OAuth)
@@ -19,7 +19,7 @@
 
 1. Set up Docker Swarm and [`abra`][abra]
 2. Deploy [`coop-cloud/traefik`][compose-traefik]
-3. `abra app new hedegedoc`
+3. `abra app new hedgedoc`
 4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app deploy YOURAPPDOMAIN`

abra.sh

@@ -1,4 +1,4 @@
-export ENTRYPOINT_CONF_VERSION=v6
+export ENTRYPOINT_CONF_VERSION=v9
 
 abra_backup_app() {
   _abra_backup_dir "app:/home/hackmd/app/public/uploads/"

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   app:
-    image: quay.io/hedgedoc/hedgedoc:1.9.8
+    image: quay.io/hedgedoc/hedgedoc:1.9.9
     environment:
       - CMD_USECDN=false
       - CMD_URL_ADDPORT=false
@@ -57,7 +57,8 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - coop-cloud.${STACK_NAME}.version=0.5.1+1.9.8
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
+        - "coop-cloud.${STACK_NAME}.version=1.0.1+1.9.9"
     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); } });\""
       interval: 30s
@@ -65,7 +66,7 @@ services:
       retries: 10
       start_period: 1m
   db:
-    image: postgres:11.20-alpine
+    image: postgres:16.1-alpine
     environment:
       - POSTGRES_USER=codimd
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
@@ -79,9 +80,11 @@ services:
     deploy:
       labels:
           backupbot.backup: "true"
-          backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
+          backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
-          backupbot.backup.post-hook: "rm -rf /tmp/backup"
+          backupbot.backup.post-hook: "rm -f /var/lib/postgresql/data/backup.sql"
-          backupbot.backup.path: "/tmp/backup/"
+          backupbot.backup.path: "/var/lib/postgresql/data/backup.sql"
+          backupbot.restore: "true"
+          backupbot.restore.post-hook: "sh -c 'psql -U $${POSTGRES_USER} -d $${POSTGRES_DB} < /var/lib/postgresql/data/backup.sql && rm -f /var/lib/postgresql/data/backup.sql'"
 volumes:
   postgres:
   codimd_uploads:

entrypoint.sh.tmpl

@@ -1,35 +1,38 @@
 #!/usr/bin/env bash
 
 file_env() {
-	# 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
+  # 3wc: Load $VAR_FILE into $VAR - useful for secrets. See
-	# 	https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
+  #   https://medium.com/@adrian.gheorghe.dev/using-docker-secrets-in-your-environment-variables-7a0609659aab
-	local var="$1"
+  local var="$1"
-	local fileVar="${var}_FILE"
+  local fileVar="${var}_FILE"
-	local def="${2:-}"
+  local def="${2:-}"
 
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+  if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+    echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-		exit 1
+    exit 1
-	fi
+  fi
-	local val="$def"
+  local val="$def"
-	if [ "${!var:-}" ]; then
+  if [ "${!var:-}" ]; then
-		val="${!var}"
+    val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
+  elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
+    val="$(< "${!fileVar}")"
-	fi
+  fi
-	export "$var"="$val"
+  export "$var"="$val"
-	unset "$fileVar"
+  unset "$fileVar"
 }
 
 load_vars() {
-	file_env "CMD_DB_PASSWORD"
+  file_env "CMD_DB_PASSWORD"
-	file_env "CMD_OAUTH2_CLIENT_SECRET"
+  file_env "CMD_OAUTH2_CLIENT_SECRET"
 }
 
 main() {
-	set -eu
+  set -eu
 
-	load_vars
+  load_vars
+  mkdir -p "/hedgedoc/.npm" && \
+    chown -R 10000:65534 "/hedgedoc/.npm" && \
+    chmod "u+rwx" "/hedgedoc/.npm"
 }
 
 main
@@ -38,9 +41,10 @@ export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CM
 
 # 3wc: `source /docker-entrypoint2.sh -e` to load CMD_DB_URL for CLI scripts
 if [ ! "${1-}" == "-e" ]; then
-	# 3wc: upstream ENTRYPOINT
+  # 3wc: upstream ENTRYPOINT
-	# https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
+  # https://github.com/hedgedoc/container/blob/master/alpine/Dockerfile
-	/usr/local/bin/docker-entrypoint.sh npm start
+   mkdir -p "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm"
+  /usr/local/bin/docker-entrypoint.sh npm start
 fi
 
 set +eu

release/1.0.0+1.9

@@ -0,0 +1,7 @@
+WARNING WARNING WARNING 🚨
+
+This release includes a major Postgres database upgrade, but does not yet include tools to automatically upgrade from older Postgres releases.
+
+PLEASE DO NOT UPGRADE EXISTING INSTANCES TO THIS VERSION.
+
+This should be fixed soon.