From bb90d6fb15c4bd90840b40631f551a5a821e3f77 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Mon, 3 May 2021 22:53:01 +0300
Subject: [PATCH] use-external-database

---
 .env-services-dist | 12 ------------
 .gitignore         |  4 +---
 Makefile           |  3 ++-
 docker-compose.yml | 17 -----------------
 env/.env-dist      |  6 ++++++
 5 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 .env-services-dist
 create mode 100644 env/.env-dist

diff --git a/.env-services-dist b/.env-services-dist
deleted file mode 100644
index 1414289..0000000
--- a/.env-services-dist
+++ /dev/null
@@ -1,12 +0,0 @@
-# wiki_db
-POSTGRES_DB=
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-
-# wiki_instance
-DB_TYPE=postgres
-DB_HOST=wiki_db
-DB_PORT=5432
-DB_NAME=
-DB_USER=
-DB_PASS=
diff --git a/.gitignore b/.gitignore
index 700c028..05d6928 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/etc/db-data
-/.env-wiki_db
-/.env-wiki_instance
+/env/.env
diff --git a/Makefile b/Makefile
index e616097..7549f9e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@ lint-yaml:
 
 restart:
 	docker-compose -f docker-compose.yml pull
-	docker-compose -f docker-compose.yml restart
+	docker-compose -f docker-compose.yml stop
+	docker-compose -f docker-compose.yml up -d
 
 cleanup:
 	docker system prune --all --force
diff --git a/docker-compose.yml b/docker-compose.yml
index 4dc2102..4b95033 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,29 +1,12 @@
 ---
 version: "3"
 services:
-  wiki_db:
-    image: postgres:13-alpine
-    container_name: wiki_db
-
-    hostname: wiki_db
-    restart: unless-stopped
-
-    logging:
-      driver: "none"
-
-    env_file:
-      - ./.env-wiki_db
-
-    volumes:
-      - ./etc/db-data:/var/lib/postgresql/data
   wiki_instance:
     image: requarks/wiki:2.5
     container_name: wiki_instance
 
     hostname: wiki_instance
     restart: unless-stopped
-    depends_on:
-      - wiki_db
 
     env_file:
       - ./.env-wiki_instance
diff --git a/env/.env-dist b/env/.env-dist
new file mode 100644
index 0000000..c6e222e
--- /dev/null
+++ b/env/.env-dist
@@ -0,0 +1,6 @@
+DB_TYPE=postgres
+DB_HOST=192.168.1.152
+DB_PORT=5432
+DB_NAME=
+DB_USER=
+DB_PASS=