From 075fd02bd6bba7dbae076deb822d84eddc1de54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 4 Jul 2023 21:15:10 +0200
Subject: [PATCH] refactor: Remove basic auth env vars from docker compose
 stacks (#6570)

* refactor: Remove basic auth env vars from MariaDB stack

* refactor: Remove envs from other stacks

* refactor: Remove MariaDB example
---
 docker/compose/subfolderWithSSL/.env          |  6 ---
 docker/compose/withMariaDB/.env               |  8 ----
 docker/compose/withMariaDB/README.md          | 24 -----------
 docker/compose/withMariaDB/docker-compose.yml | 43 -------------------
 docker/compose/withPostgres/.env              |  3 --
 docker/compose/withPostgresAndWorker/.env     |  3 --
 6 files changed, 87 deletions(-)
 delete mode 100644 docker/compose/withMariaDB/.env
 delete mode 100644 docker/compose/withMariaDB/README.md
 delete mode 100644 docker/compose/withMariaDB/docker-compose.yml

diff --git a/docker/compose/subfolderWithSSL/.env b/docker/compose/subfolderWithSSL/.env
index 7008bd631a..c0b6bb180d 100644
--- a/docker/compose/subfolderWithSSL/.env
+++ b/docker/compose/subfolderWithSSL/.env
@@ -11,12 +11,6 @@ N8N_PATH=/app1/
 # DOMAIN_NAME and SUBDOMAIN combined decide where n8n will be reachable from
 # above example would result in: https://example.com/n8n/
 
-# The user name to use for autentication - IMPORTANT ALWAYS CHANGE!
-N8N_BASIC_AUTH_USER=user
-
-# The password to use for autentication - IMPORTANT ALWAYS CHANGE!
-N8N_BASIC_AUTH_PASSWORD=password
-
 # Optional timezone to set which gets used by Cron-Node by default
 # If not set New York time will be used
 GENERIC_TIMEZONE=Europe/Berlin
diff --git a/docker/compose/withMariaDB/.env b/docker/compose/withMariaDB/.env
deleted file mode 100644
index 48f9efcd64..0000000000
--- a/docker/compose/withMariaDB/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-MARIADB_ROOT_PASSWORD=changePassword
-
-MARIADB_DATABASE=n8n
-MARIADB_USER=changeUser
-MARIADB_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withMariaDB/README.md b/docker/compose/withMariaDB/README.md
deleted file mode 100644
index 6af2fa8c8a..0000000000
--- a/docker/compose/withMariaDB/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# n8n with MariaDB
-
-Starts n8n with MariaDB as database.
-
-## Start
-
-To start n8n with MariaDB simply start docker-compose by executing the following
-command in the current folder.
-
-**IMPORTANT:** But before you do that change the default users and passwords in the [`.env`](.env) file!
-
-```
-docker-compose up -d
-```
-
-To stop it execute:
-
-```
-docker-compose stop
-```
-
-## Configuration
-
-The default name of the database, user and password for MariaDB can be changed in the [`.env`](.env) file in the current directory.
diff --git a/docker/compose/withMariaDB/docker-compose.yml b/docker/compose/withMariaDB/docker-compose.yml
deleted file mode 100644
index e7a1db74e0..0000000000
--- a/docker/compose/withMariaDB/docker-compose.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: '3.8'
-
-volumes:
-  db_storage:
-  n8n_storage:
-
-services:
-  db:
-    image: mariadb:10.7
-    restart: always
-    environment:
-      - MARIADB_ROOT_PASSWORD
-      - MARIADB_DATABASE
-      - MARIADB_USER
-      - MARIADB_PASSWORD
-      - MARIADB_MYSQL_LOCALHOST_USER=true
-    volumes:
-      - db_storage:/var/lib/mysql
-    healthcheck:
-      test: "/usr/bin/mysql --user=${MARIADB_USER} --password=${MARIADB_PASSWORD} --execute 'SELECT 1;'"
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  n8n:
-    image: docker.n8n.io/n8nio/n8n
-    restart: always
-    environment:
-      - DB_TYPE=mariadb
-      - DB_MYSQLDB_HOST=db
-      - DB_MYSQLDB_DATABASE=${MARIADB_DATABASE}
-      - DB_MYSQLDB_USER=${MARIADB_USER}
-      - DB_MYSQLDB_PASSWORD=${MARIADB_PASSWORD}
-    ports:
-      - 5678:5678
-    links:
-      - db
-    volumes:
-      - n8n_storage:/home/node/.n8n
-    command: n8n start --tunnel
-    depends_on:
-      db:
-        condition: service_healthy
diff --git a/docker/compose/withPostgres/.env b/docker/compose/withPostgres/.env
index c074f42c9e..90b6726ead 100644
--- a/docker/compose/withPostgres/.env
+++ b/docker/compose/withPostgres/.env
@@ -4,6 +4,3 @@ POSTGRES_DB=n8n
 
 POSTGRES_NON_ROOT_USER=changeUser
 POSTGRES_NON_ROOT_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword
diff --git a/docker/compose/withPostgresAndWorker/.env b/docker/compose/withPostgresAndWorker/.env
index c074f42c9e..90b6726ead 100644
--- a/docker/compose/withPostgresAndWorker/.env
+++ b/docker/compose/withPostgresAndWorker/.env
@@ -4,6 +4,3 @@ POSTGRES_DB=n8n
 
 POSTGRES_NON_ROOT_USER=changeUser
 POSTGRES_NON_ROOT_PASSWORD=changePassword
-
-N8N_BASIC_AUTH_USER=changeUser
-N8N_BASIC_AUTH_PASSWORD=changePassword