From 40d525e9cb638f76a894a66c33baeab7958c765d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:08 +0200 Subject: [PATCH 1/5] Add postgresql --- docker/postgres/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/postgres/docker-compose.yaml diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml new file mode 100644 index 00000000..92942046 --- /dev/null +++ b/docker/postgres/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "3" +services: + postgres: + container_name: postgres + image: postgres:13 + environment: + - TZ=Europe/Helsinki + - POSTGRES_PASSWORD=12345 + ports: + - 5432:5432 + networks: + - postgres + volumes: + - /docker/postgres:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + +networks: + postgres: + external: true From ad0a1aaed7aa07d82ca40510e7648285fa094988 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:26 +0200 Subject: [PATCH 2/5] Move nextcloud to postgresql --- docker/nextcloud/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index e424267e..50275831 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,7 +9,7 @@ services: - "1869:80" networks: - nextcloud - - mariadb + - postgres - proxy volumes: - /docker/nextcloud:/var/www/html @@ -19,7 +19,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki - - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis - REDIS_HOST_PASSWORD=123 depends_on: @@ -61,7 +60,7 @@ services: networks: nextcloud: external: false - mariadb: + postgres: external: true proxy: external: true From 83bfedf9cc83ae052700f440cbe9ee911648c225 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 12:14:05 +0200 Subject: [PATCH 3/5] Change freshrss to postgresql --- docker/freshrss/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index aaf1286e..5c2ec94f 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped networks: - freshrss - - mariadb + - postgres - proxy ports: - 8088:80 @@ -36,7 +36,7 @@ services: networks: freshrss: external: false - mariadb: + postgres: external: true proxy: external: true From 2e2bfe468fa879e63d7af9dd2e584a368a3fccc1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:40:57 +0200 Subject: [PATCH 4/5] Move gitea to postgresql --- docker/gitea/docker-compose.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 4fafc49e..b633d3e7 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -8,14 +8,9 @@ services: - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - - DB_TYPE=mysql - - DB_HOST=mariadb:3306 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - mariadb + - postgres - proxy ports: - "3000:3000" @@ -40,7 +35,7 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - mariadb: + postgres: external: true proxy: external: true From d923eb66281b848a286f5266efb92bc427689a8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:41:25 +0200 Subject: [PATCH 5/5] Move homeautomation for postgresql --- docker/homeautomation/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d339b160..ebcf1206 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - homeautomation - - mariadb + - postgres - proxy ports: - "8123:8123" @@ -133,11 +133,11 @@ services: volumes: - /docker/homeautomation/gotify:/app/data environment: - - GOTIFY_DATABASE_DIALECT=mysql - - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + - GOTIFY_DATABASE_DIALECT=postgres + - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" networks: - proxy - - mariadb + - postgres restart: unless-stopped labels: - "traefik.enable=true" @@ -158,7 +158,7 @@ services: networks: homeautomation: external: false - mariadb: + postgres: external: true proxy: external: true