Compare commits

...

14 Commits

Author SHA1 Message Date
3wc
db29a2ec3c chore: publish 0.7.0+0.237.0 release 2024-01-20 21:40:59 -03:00
3wc
e1e9a05be3 Add postgres upgrade magic 2024-01-20 21:40:15 -03:00
3wc
a9bb848aba chore: publish 0.6.2+0.236.3 release 2023-07-25 15:47:15 +01:00
3wc
30d9f2976e Don't specify image in compose.sso..
..otherwise it sneakily upgrades us to n8n:latest which is Not Good
2023-07-25 15:46:41 +01:00
3wc
f4f7f6d720 chore: publish 0.6.1+0.236.3 release 2023-07-24 14:24:15 +01:00
3wc
89e09081cf chore: publish 0.6.0+0.236.0 release 2023-07-08 19:46:02 +01:00
3wc
09dd23d512 chore: publish 0.5.0+0.226.0 release 2023-04-27 14:57:25 -04:00
3wc
4457cc7d28 Switch to self-hosted stack-ssh-deploy image [mass update] 2023-01-21 11:49:56 -08:00
3wc
0815a8ed69 Add drone configs / secrets [mass update] 2023-01-20 21:32:06 -08:00
3wc
d970a329fb Add CI and catalogue generation [mass update] 2023-01-20 10:45:03 -08:00
3wc
5b4591fb8b Update abra syntax in examples (finally) [mass update] 2023-01-19 16:02:28 -08:00
3wc
abbbb96751 Update README 2022-11-26 12:25:31 -08:00
3wc
9a7455acc0 chore: publish 0.4.1+0.204.0 release 2022-11-26 11:53:27 -08:00
3wc
2c8a827d52 chore: publish 0.4.0+0.204.0 release 2022-11-26 11:48:08 -08:00
8 changed files with 119 additions and 11 deletions

39
.drone.yml Normal file
View File

@ -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:
- coop-cloud/auto-recipes-catalogue-json
trigger:
event: tag

View File

@ -8,11 +8,24 @@ LETS_ENCRYPT_ENV=production
SECRET_DB_PASSWORD_VERSION=v1
# Change to `true` to enable sending "anonymous" telemetry data to n8n
# https://docs.n8n.io/reference/data-collection/
N8N_DIAGNOSTICS_ENABLED=false
# Change to `true` to enable questionnaire-based customisation of the UI
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"
# Disable user management completely, useful for SSO
#N8N_USER_MANAGEMENT_DISABLED=false
# Basic auth
#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml"
#N8N_BASIC_AUTH_ACTIVE=true

BIN
.env.sample.swp Normal file

Binary file not shown.

View File

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

1
abra.sh Normal file
View File

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

View File

@ -4,7 +4,6 @@ version: '3.8'
services:
app:
image: n8nio/n8n
environment:
- N8N_BASIC_AUTH_ACTIVE=false
deploy:

View File

@ -1,10 +1,9 @@
---
version: '3.8'
services:
app:
image: n8nio/n8n:0.204.0
image: n8nio/n8n:0.237.0
environment:
- DB_TYPE=postgresdb
- DB_POSTGRESDB_HOST=${STACK_NAME}_db
@ -12,6 +11,9 @@ services:
- DB_POSTGRESDB_DATABASE=n8n
- DB_POSTGRESDB_USER=root
- DB_POSTGRESDB_PASSWORD_FILE=/run/secrets/db_password
- N8N_PERSONALIZATION_ENABLED
- N8N_DIAGNOSTICS_ENABLED
- N8N_USER_MANAGEMENT_DISABLED
- N8N_BASIC_AUTH_ACTIVE=false
- WEBHOOK_URL=https://${DOMAIN}
- NODE_FUNCTION_ALLOW_EXTERNAL=moment
@ -38,25 +40,29 @@ 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.3.0+0.204.0"
- "coop-cloud.${STACK_NAME}.version=0.7.0+0.237.0"
- "backupbot.backup=true"
- "backupbot.backup.path=/home/node/.n8n"
db:
image: postgres:11
image: postgres:16
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/data'
# - ./init-data.sh:/docker-entrypoint-initdb.d/init-data.sh
entrypoint: /docker-entrypoint.sh
deploy:
labels:
backupbot.backup: "true"
@ -80,3 +86,9 @@ networks:
proxy:
external: true
internal_network:
configs:
db_entrypoint:
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
file: entrypoint.postgres.sh.tmpl
template_driver: golang

View File

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