From 071cfe35491393ddbd778bdb7349e6c99d122421 Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <47644445+meienberger@users.noreply.github.com>
Date: Sun, 10 Dec 2023 19:30:50 +0100
Subject: [PATCH] Fix/n8n base url (#1786)

* fix(n8n): add protocol to N8N_EDITOR_BASE_URL

* chore(n8n): remove un-used postgres db
---
 apps/n8n/config.json        |  6 ++----
 apps/n8n/docker-compose.yml | 25 ++-----------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/apps/n8n/config.json b/apps/n8n/config.json
index 7b1fb586..feaf40c5 100644
--- a/apps/n8n/config.json
+++ b/apps/n8n/config.json
@@ -5,11 +5,9 @@
   "exposable": true,
   "port": 8094,
   "id": "n8n",
-  "tipi_version": 23,
+  "tipi_version": 25,
   "version": "0.237.0",
-  "categories": [
-    "automation"
-  ],
+  "categories": ["automation"],
   "description": "n8n is an extendable workflow automation tool. With a fair-code distribution model, n8n will always have visible source code, be available to self-host, and allow you to add your own custom functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect anything to everything.",
   "short_desc": "Workflow Automation Tool. Alternative to Zapier",
   "author": "n8n.io",
diff --git a/apps/n8n/docker-compose.yml b/apps/n8n/docker-compose.yml
index fd017809..b7577d4f 100644
--- a/apps/n8n/docker-compose.yml
+++ b/apps/n8n/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: '3.7'
 
 services:
   n8n:
@@ -11,15 +11,7 @@ services:
       - ${APP_DATA_DIR}/data/n8n:/home/node/.n8n
     command: /bin/sh -c "sleep 5; n8n start"
     environment:
-      - DB-TYPE=postgresdb
-      - DB_POSTGRESDB_DATABASE=n8n
-      - DB_POSTGRESDB_HOST=db-n8n
-      - DB_POSTGRESDB_PORT=5432
-      - DB_POSTGRESDB_USER=tipi
-      - DB_POSTGRESDB_PASSWORD=tipi
-      - N8N_EDITOR_BASE_URL=${APP_DOMAIN}
-    depends_on:
-      - db-n8n
+      - N8N_EDITOR_BASE_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
     networks:
       - tipi_main_network
     labels:
@@ -47,16 +39,3 @@ services:
       traefik.http.routers.n8n-local.entrypoints: websecure
       traefik.http.routers.n8n-local.service: n8n
       traefik.http.routers.n8n-local.tls: true
-
-  db-n8n:
-    container_name: db-n8n
-    image: postgres:14.2
-    restart: on-failure
-    volumes:
-      - ${APP_DATA_DIR}/data/db:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_USER=tipi
-      - POSTGRES_DB=n8n
-    networks:
-      - tipi_main_network