Merge pull request 'chore: upgrade to 3.3.0+2.23.2' (#10) from upgrade-3.3.0+2.23.2 into main

Reviewed-on: https://git.coopcloud.tech/coop-cloud/n8n/pulls/10

.drone.yml

@@ -0,0 +1,39 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: n8n
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: n8n.swarm-test.autonomic.zone
+      STACK_NAME: n8n
+      LETS_ENCRYPT_ENV: production
+      SECRET_DB_PASSWORD_VERSION: v1
+trigger:
+  branch:
+    - main
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - toolshed/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -6,13 +6,27 @@ DOMAIN=n8n.example.com
 #EXTRA_DOMAINS=', `www.n8n.example.com`'
 LETS_ENCRYPT_ENV=production
 
-# Only required if you're not using SSO
+# Change to `true` to enable sending "anonymous" telemetry data to n8n
-N8N_BASIC_AUTH_USER=username
+# https://docs.n8n.io/reference/data-collection/
+N8N_DIAGNOSTICS_ENABLED=false
 
-SECRET_DB_PASSWORD_VERSION=v1
+# Change to `true` to enable questionnaire-based customisation of the UI
-SECRET_ADMIN_PASSWORD_VERSION=v1
+N8N_PERSONALIZATION_ENABLED=false
+
+# "Permit users to import specific built-in modules in the Code node"
+#NODE_FUNCTION_ALLOW_BUILTIN=*
 
 COMPOSE_FILE="compose.yml"
 
 # SSO using traefik-forward-auth
 #COMPOSE_FILE="$COMPOSE_FILE:compose.sso.yml"
+
+# Basic auth
+#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
+#N8N_BASIC_AUTH_ACTIVE=true
+#N8N_BASIC_AUTH_USER=username
+#SECRET_ADMIN_PASSWORD_VERSION=v1
+
+# Use Postgres instead of SQLite
+#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
+#SECRET_DB_PASSWORD_VERSION=v1

README.md

@@ -6,7 +6,7 @@ Extensible environment for interactive and reproducible computing
 
 * **Category**: Utilities
 * **Status**: 1
-* **Image**: `n8nio/n8n`
+* **Image**: [`n8nio/n8n`](https://hub.docker.com/n8nio/n8n), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: N/A
@@ -21,19 +21,19 @@ Extensible environment for interactive and reproducible computing
 2. Deploy [`coop-cloud/traefik`]
 3. `abra app new ${REPO_NAME} --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
+5. `abra app deploy YOURAPPDOMAIN`
 6. Open the configured domain in your browser to finish set-up
 
 Currently, you have to manually run a command to generate an initial
 configuration (see #1):
 
-`abra app YOURAPPDOMAIN run app jupyter notebook --generate-config`
+`abra app run YOURAPPDOMAIN app jupyter notebook --generate-config`
 
 And then run this command to get a token for initial login:
 
-`abra app YOURAPPDOMAIN run app jupyter notebook list`
+`abra app run YOURAPPDOMAIN app jupyter notebook list`
 
 You can enter this token at the bottom of the login page to set a password
 instead (see #2).

abra.sh

@@ -0,0 +1 @@
+export DB_ENTRYPOINT_VERSION=v1

compose.basicauth.yml

@@ -0,0 +1,13 @@
+services:
+  app:
+    environment:
+      - N8N_BASIC_AUTH_ACTIVE=true
+      - N8N_BASIC_AUTH_USER
+      - N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
+    secrets:
+      - admin_password
+
+secrets:
+  admin_password:
+    external: true
+    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}

compose.postgres.yml

@@ -0,0 +1,57 @@
+# Compose for PostGres mode instead of the default sqlite mode.
+services:
+  app:
+    environment:
+      - DB_TYPE=postgresdb
+      - DB_POSTGRESDB_HOST=${STACK_NAME}_db
+      - DB_POSTGRESDB_PORT=5432
+      - DB_POSTGRESDB_DATABASE=n8n
+      - DB_POSTGRESDB_USER=root
+      - DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
+    depends_on:
+      - db
+    secrets:
+      - db_password
+
+  db:
+    image: pgautoupgrade/pgautoupgrade:18-alpine
+    networks:
+      - internal_network
+    environment:
+      - POSTGRES_USER=root
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+      - POSTGRES_DB=n8n
+    configs:
+      - source: db_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
+    secrets:
+      - db_password
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "root", "-d", "n8n"]
+    volumes:
+      - 'postgresql_data:/var/lib/postgresql'
+    entrypoint: /docker-entrypoint.sh
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.pre-hook: "bash -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup.sql'"
+        backupbot.backup.post-hook: "rm -rf /tmp/backup.sql"
+        backupbot.backup.path: "/tmp/backup.sql"
+
+secrets:
+  # db_non_root_password:
+  #   external: true
+  #   name: ${STACK_NAME}_db_non_root_password_${SECRET_DB_NON_ROOT_PASSWORD_VERSION}
+  db_password:
+    external: true
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+
+volumes:
+  postgresql_data:
+
+configs:
+  db_entrypoint:
+    name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
+    file: entrypoint.postgres.sh.tmpl
+    template_driver: golang

compose.sso.yml

@@ -1,10 +1,5 @@
----
-
-version: '3.8'
-
 services:
   app:
-    image: n8nio/n8n
     environment:
       - N8N_BASIC_AUTH_ACTIVE=false
     deploy:

compose.yml

@@ -1,32 +1,18 @@
----
-
-version: '3.8'
-
 services:
   app:
-    image: n8nio/n8n:0.162.0
+    image: n8nio/n8n:2.23.2
     environment:
-      - DB_TYPE=postgresdb
+      - N8N_PERSONALIZATION_ENABLED
-      - DB_POSTGRESDB_HOST=${STACK_NAME}_db
+      - N8N_DIAGNOSTICS_ENABLED
-      - DB_POSTGRESDB_PORT=5432
+      - N8N_USER_MANAGEMENT_DISABLED
-      - DB_POSTGRESDB_DATABASE=n8n
+      - N8N_BASIC_AUTH_ACTIVE=false
-      - DB_POSTGRESDB_USER=root
-      - DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
-      - N8N_BASIC_AUTH_ACTIVE=true
-      - N8N_BASIC_AUTH_USER
-      - N8N_BASIC_AUTH_PASSWORD_FILE=/run/secrets/admin_password
       - WEBHOOK_URL=https://${DOMAIN}
       - NODE_FUNCTION_ALLOW_EXTERNAL=moment
-    depends_on:
-      - db
     networks:
       - proxy
       - internal_network
     volumes:
       - n8n:/home/node/.n8n
-    secrets:
-      - db_password
-      - admin_password
     deploy:
       update_config:
         failure_action: rollback
@@ -39,41 +25,14 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
-        - "coop-cloud.${STACK_NAME}.version=0.2.0+0.162.0"
+        - "coop-cloud.${STACK_NAME}.version=3.3.0+2.23.2"
-
+        - "backupbot.backup=true"
-  db:
+        - "backupbot.backup.path=/home/node/.n8n"
-    image: postgres:11
-    networks:
-      - internal_network
-    environment:
-      - POSTGRES_USER=root
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
-      - POSTGRES_DB=n8n
-    secrets:
-      - db_password
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "root", "-d", "n8n"]
-    volumes:
-      - 'postgresql_data:/var/lib/postgresql/data'
-    #   - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
-
-
-secrets:
-  # db_non_root_password:
-  #   external: true
-  #   name: ${STACK_NAME}_db_non_root_password_${SECRET_DB_NON_ROOT_PASSWORD_VERSION}
-  db_password:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-  admin_password:
-    external: true
-    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
 
 volumes:
   n8n:
-  postgresql_data:
 
 networks:
   proxy:

entrypoint.postgres.sh.tmpl

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+
+MIGRATION_MARKER=$PGDATA/migration_in_progress
+OLDDATA=$PGDATA/old_data
+NEWDATA=$PGDATA/new_data
+
+if [ -e $MIGRATION_MARKER ]; then
+  echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
+  exit 1
+fi
+
+if [ -f $PGDATA/PG_VERSION ]; then
+  DATA_VERSION=$(cat $PGDATA/PG_VERSION)
+
+  if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
+    echo "postgres data version $DATA_VERSION found, but need $PG_MAJOR. Starting migration"
+    echo "Installing postgres $DATA_VERSION"
+    sed -i "s/$/ $DATA_VERSION/" /etc/apt/sources.list.d/pgdg.list
+    apt-get update && apt-get install -y --no-install-recommends \
+      postgresql-$DATA_VERSION \
+      && rm -rf /var/lib/apt/lists/*
+    echo "shuffling around"
+    gosu postgres mkdir $OLDDATA $NEWDATA
+    chmod 700 $OLDDATA $NEWDATA
+    mv $PGDATA/* $OLDDATA/ || true
+    touch $MIGRATION_MARKER
+    echo "running initdb"
+    # abuse entrypoint script for initdb by making server error out
+    gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true"
+    echo "running pg_upgrade"
+    cd /tmp
+    gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER
+    cp $OLDDATA/pg_hba.conf $NEWDATA/
+    mv $NEWDATA/* $PGDATA
+    rm -rf $OLDDATA
+    rmdir $NEWDATA
+    rm $MIGRATION_MARKER
+    echo "migration complete"
+  fi
+fi
+
+/usr/local/bin/docker-entrypoint.sh postgres

release/1.0.0+1.81.2

@@ -0,0 +1,9 @@
+ALERTA ALERTA
+
+N8N recipe is switching from deploying a PostgreSQL and setting it as the database to using the
+built-in SQLite database instead. PostgreSQL can still be enabled, see .env.sample for the
+lines to add to your configuration to enable it (should retain data that was in Postgres).
+
+There is no clean migration path between sqlite and postgres. Committing to one pretty much
+sticks you to that one (there are hacks but it is involved and incomplete).
+

release/2.0.0+1.114.4

@@ -0,0 +1,3 @@
+There are lots of changes between v1.81 and v1.114, but seems like there's
+only one breaking change involving pyiode/python runners.
+See here more for info: https://docs.n8n.io/release-notes/#n8n11132

release/3.0.0+2.1.4

@@ -0,0 +1,6 @@
+This is a major release from n8n. There have been lots of changes,
+some of which that need manual migration before update.
+
+You can see the summary of breaking changes here: https://docs.n8n.io/2-0-breaking-changes/
+
+And you can follow the guide of the migration tool here: https://docs.n8n.io/migration-tool-v2/