fix: pass "-p" and use new lines

Closes coop-cloud/hedgedoc#13

abra.sh

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

compose.yml

@@ -57,8 +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}.timeout=${TIMEOUT:-120}
-        - coop-cloud.${STACK_NAME}.version=0.6.0+1.9.9
+        - "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
@@ -66,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
@@ -80,11 +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.post-hook: "rm -rf /tmp/backup"
-          backupbot.backup.path: "/tmp/backup/"
+          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 -f /var/lib/postgresql/data/backup.sql"
+          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} < ./backup.sql && rm -f ./backup.sql'"
+          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

@@ -30,7 +30,9 @@ main() {
   set -eu
 
   load_vars
-  mkdir "/hedgedoc/.npm" && chown -R 10000:65534 "/hedgedoc/.npm" && chmod "u+rwx" "/hedgedoc/.npm"
+  mkdir -p "/hedgedoc/.npm" && \
+    chown -R 10000:65534 "/hedgedoc/.npm" && \
+    chmod "u+rwx" "/hedgedoc/.npm"
 }
 
 main

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.