Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c94a9327d | |||
| 9aea81b32d | |||
| 5ca5f5ffc1 | |||
| aaf976f4db | |||
| a3a1ab6d2b | |||
| 02056b645a | |||
| 1344cca505 | |||
| c7f5edf7e6 | |||
| 557a7ce1bb | |||
| 8c447c4a0c | |||
| 8ab960b15a | |||
| 06ff58d06d | |||
| 99806b33d9 | |||
| 44cb2cf748 | |||
| 75f3b9f621 | |||
| 6d1b36530c | |||
| ad90c45804 | |||
| 1a5d7447ec | |||
| 74f09c0cf7 | |||
| e321a8abb6 | |||
| c9b5b61398 | |||
| bf400a2060 | |||
| 4e5ecb91a3 |
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
ARG N8N_VERSION=ai-beta
|
ARG N8N_VERSION=1.82.3
|
||||||
FROM docker.n8n.io/n8nio/n8n:${N8N_VERSION}
|
FROM docker.n8n.io/n8nio/n8n:${N8N_VERSION}
|
||||||
USER root
|
USER root
|
||||||
RUN apk add --no-cache --update jq bash
|
RUN apk add --no-cache --update jq bash
|
||||||
|
|||||||
+18
-5
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Hass n8n",
|
"name": "Hass n8n",
|
||||||
"version": "1.11.1.8",
|
"version": "1.72.1",
|
||||||
"slug": "hass-n8n",
|
"slug": "hass-n8n",
|
||||||
"description": "Self host your n8n instance",
|
"description": "Self host your n8n instance",
|
||||||
"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
|
"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
|
||||||
@@ -9,7 +9,10 @@
|
|||||||
"icon": "ico.png",
|
"icon": "ico.png",
|
||||||
"logo": "ico.png",
|
"logo": "ico.png",
|
||||||
"webui": "[PROTO:protocol]://[HOST]:[PORT:5678]/",
|
"webui": "[PROTO:protocol]://[HOST]:[PORT:5678]/",
|
||||||
"map": ["ssl", "share"],
|
"map": [
|
||||||
|
"share:rw",
|
||||||
|
"ssl:rw"
|
||||||
|
],
|
||||||
"apparmor": true,
|
"apparmor": true,
|
||||||
"ports": {
|
"ports": {
|
||||||
"5678/tcp": 5678
|
"5678/tcp": 5678
|
||||||
@@ -21,17 +24,24 @@
|
|||||||
"auth": false,
|
"auth": false,
|
||||||
"auth_username": "",
|
"auth_username": "",
|
||||||
"auth_password": "",
|
"auth_password": "",
|
||||||
"n8n_host": "n8n.automator.keenetic.link",
|
"n8n_host": "n8n.automator.dedyn.io",
|
||||||
"n8n_port": "5678",
|
"n8n_port": "5678",
|
||||||
"node_env": "production",
|
"node_env": "production",
|
||||||
"webhook_tunnel_url": "https://n8n.automator.keenetic.link/",
|
"webhook_tunnel_url": "https://n8n.automator.dedyn.io/",
|
||||||
"timezone": "Europe/Kiev",
|
"timezone": "Europe/Kiev",
|
||||||
"protocol": "http",
|
"protocol": "http",
|
||||||
"certfile": "fullchain_fixed.pem",
|
"certfile": "fullchain_fixed.pem",
|
||||||
"keyfile": "privkey_fixed.pem",
|
"keyfile": "privkey_fixed.pem",
|
||||||
"cmd_line_args": ""
|
"env_vars_list": [
|
||||||
|
"WEBHOOK_URL: https://n8n.automator.dedyn.io"
|
||||||
|
],
|
||||||
|
"cmd_line_args": "start",
|
||||||
|
"encryption_key": "",
|
||||||
|
"user_folder": "/share/n8n"
|
||||||
},
|
},
|
||||||
"schema": {
|
"schema": {
|
||||||
|
"encryption_key": "str?",
|
||||||
|
"user_folder": "str?",
|
||||||
"auth": "bool",
|
"auth": "bool",
|
||||||
"auth_username": "str?",
|
"auth_username": "str?",
|
||||||
"auth_password": "str?",
|
"auth_password": "str?",
|
||||||
@@ -43,6 +53,9 @@
|
|||||||
"protocol": "str",
|
"protocol": "str",
|
||||||
"certfile": "str",
|
"certfile": "str",
|
||||||
"keyfile": "str",
|
"keyfile": "str",
|
||||||
|
"env_vars_list": [
|
||||||
|
"match(^[A-Z_0-9]+: .*$)"
|
||||||
|
],
|
||||||
"cmd_line_args": "str?"
|
"cmd_line_args": "str?"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
CONFIG_PATH="/data/options.json"
|
CONFIG_PATH="/data/options.json"
|
||||||
N8N_PATH="/data/n8n"
|
N8N_PATH="$(jq --raw-output '.user_folder // empty' $CONFIG_PATH)"
|
||||||
|
|
||||||
mkdir -p "${N8N_PATH}/.n8n/.cache"
|
mkdir -p "${N8N_PATH}/.n8n/.cache"
|
||||||
|
|
||||||
@@ -27,6 +27,10 @@ do
|
|||||||
echo "exported ${key}=${value}"
|
echo "exported ${key}=${value}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
export N8N_HOST="$(jq --raw-output '.n8n_host // empty' $CONFIG_PATH)"
|
||||||
|
export N8N_PORT="$(jq --raw-output '.n8n_port // empty' $CONFIG_PATH)"
|
||||||
|
export NODE_ENV="$(jq --raw-output '.node_env // empty' $CONFIG_PATH)"
|
||||||
|
export WEBHOOK_TUNNEL_URL="$(jq --raw-output '.webhook_tunnel_url // empty' $CONFIG_PATH)"
|
||||||
export N8N_BASIC_AUTH_ACTIVE="$(jq --raw-output '.auth // empty' $CONFIG_PATH)"
|
export N8N_BASIC_AUTH_ACTIVE="$(jq --raw-output '.auth // empty' $CONFIG_PATH)"
|
||||||
export N8N_BASIC_AUTH_USER="$(jq --raw-output '.auth_username // empty' $CONFIG_PATH)"
|
export N8N_BASIC_AUTH_USER="$(jq --raw-output '.auth_username // empty' $CONFIG_PATH)"
|
||||||
export N8N_BASIC_AUTH_PASSWORD="$(jq --raw-output '.auth_password // empty' $CONFIG_PATH)"
|
export N8N_BASIC_AUTH_PASSWORD="$(jq --raw-output '.auth_password // empty' $CONFIG_PATH)"
|
||||||
@@ -34,13 +38,11 @@ export GENERIC_TIMEZONE="$(jq --raw-output '.timezone // empty' $CONFIG_PATH)"
|
|||||||
export N8N_PROTOCOL="$(jq --raw-output '.protocol // empty' $CONFIG_PATH)"
|
export N8N_PROTOCOL="$(jq --raw-output '.protocol // empty' $CONFIG_PATH)"
|
||||||
export N8N_SSL_CERT="/ssl/$(jq --raw-output '.certfile // empty' $CONFIG_PATH)"
|
export N8N_SSL_CERT="/ssl/$(jq --raw-output '.certfile // empty' $CONFIG_PATH)"
|
||||||
export N8N_SSL_KEY="/ssl/$(jq --raw-output '.keyfile // empty' $CONFIG_PATH)"
|
export N8N_SSL_KEY="/ssl/$(jq --raw-output '.keyfile // empty' $CONFIG_PATH)"
|
||||||
export N8N_CMD_LINE="$(jq --raw-output '.cmd_line_args // empty' $CONFIG_PATH)"
|
export N8N_ENCRYPTION_KEY="$(jq --raw-output '.encryption_key // empty' $CONFIG_PATH)"
|
||||||
export N8N_USER_FOLDER="${N8N_PATH}"
|
export N8N_USER_FOLDER="${N8N_PATH}"
|
||||||
|
|
||||||
export N8N_HOST="$(jq --raw-output '.n8n_host // empty' $CONFIG_PATH)"
|
export N8N_CMD_LINE="$(jq --raw-output '.cmd_line_args // empty' $CONFIG_PATH)"
|
||||||
export N8N_PORT="$(jq --raw-output '.n8n_port // empty' $CONFIG_PATH)"
|
|
||||||
export NODE_ENV="$(jq --raw-output '.mode_env // empty' $CONFIG_PATH)"
|
|
||||||
export WEBHOOK_TUNNEL_URL="$(jq --raw-output '.webhook_tunnel_url // empty' $CONFIG_PATH)"
|
|
||||||
|
|
||||||
if [ -z "${N8N_BASIC_AUTH_USER}" ] || [ -z "${N8N_BASIC_AUTH_ACTIVE}" ]; then
|
if [ -z "${N8N_BASIC_AUTH_USER}" ] || [ -z "${N8N_BASIC_AUTH_ACTIVE}" ]; then
|
||||||
export N8N_BASIC_AUTH_ACTIVE=false
|
export N8N_BASIC_AUTH_ACTIVE=false
|
||||||
|
|||||||
Reference in New Issue
Block a user