.env-services-dist

@@ -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=

.gitignore

@@ -1,3 +1 @@
-/etc/db-data
-/.env-wiki_db
-/.env-wiki_instance
+/env/.env

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

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

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=