From 275f18bed006a2ca4755ddf8765f701935e77072 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Mon, 3 May 2021 23:30:18 +0300
Subject: [PATCH] use-external-database

---
 .drone.yml                                   |  2 +-
 .gitignore                                   | 11 ++++-----
 Makefile                                     |  3 ++-
 docker-compose.yml                           | 24 ++++----------------
 .env-services-dist => env/.env-services-dist |  7 +-----
 5 files changed, 14 insertions(+), 33 deletions(-)
 rename .env-services-dist => env/.env-services-dist (89%)

diff --git a/.drone.yml b/.drone.yml
index ebaeca2..08d8045 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,7 +34,7 @@ steps:
     commands:
       - cd /mnt/md0/infra/gitea
       - git pull
-      - make restart
+      - echo 'need manual restart'
 
 trigger:
   branch:
diff --git a/.gitignore b/.gitignore
index 5fa7420..42280fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
+/env/.env-gitea_db
+/env/.env-gitea_drone
+/env/.env-gitea_drone_agent_ssh
+/env/.env-gitea_drone_agent_docker
+/env/.env-gitea_instance
 /etc
-/.env-gitea_db
-/.env-gitea_drone
-/.env-gitea_drone_agent_ssh
-/.env-gitea_drone_agent_docker
-/.env-gitea_drone_db
-/.env-gitea_instance
diff --git a/Makefile b/Makefile
index 5a0c292..a1597a0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ 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
 
 .DEFAULT_GOAL := lint
diff --git a/docker-compose.yml b/docker-compose.yml
index 54bbd56..b350ebe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     restart: unless-stopped
 
     env_file:
-      - ./.env-gitea_db
+      - env/.env-gitea_db
 
     volumes:
       - ./etc/gitea_db/data:/var/lib/mysql
@@ -20,28 +20,14 @@ services:
 
     hostname: gitea_drone
     restart: always
-    depends_on:
-      - gitea_drone_db
 
     env_file:
-      - ./.env-gitea_drone
+      - env/.env-gitea_drone
     ports:
       - "2999:80"
 
     volumes:
       - ./etc/gitea_drone/data:/data
-  gitea_drone_db:
-    image: postgres:13-alpine
-    container_name: gitea_drone_db
-
-    hostname: gitea_drone_db
-    restart: unless-stopped
-
-    env_file:
-      - ./.env-gitea_drone_db
-
-    volumes:
-      - ./etc/gitea_drone_db/data:/var/lib/postgresql/data
   gitea_drone_agent_ssh:
     image: drone/drone-runner-ssh:1.0.1
     container_name: gitea_drone_agent_ssh
@@ -52,7 +38,7 @@ services:
       - gitea_drone
 
     env_file:
-      - .env-gitea_drone_agent_ssh
+      - env/.env-gitea_drone_agent_ssh
   gitea_drone_agent_docker:
     image: drone/drone-runner-docker:1.6.3
     container_name: gitea_drone_agent_docker
@@ -65,7 +51,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     env_file:
-      - .env-gitea_drone_agent_docker
+      - env/.env-gitea_drone_agent_docker
   gitea_instance:
     image: gitea/gitea:1.14.1
     container_name: gitea_instance
@@ -76,7 +62,7 @@ services:
       - gitea_db
 
     env_file:
-      - ./.env-gitea_instance
+      - env/.env-gitea_instance
     ports:
       - "222:22"
       - "3000:3000"
diff --git a/.env-services-dist b/env/.env-services-dist
similarity index 89%
rename from .env-services-dist
rename to env/.env-services-dist
index 42600e1..5412b06 100644
--- a/.env-services-dist
+++ b/env/.env-services-dist
@@ -19,7 +19,7 @@ DRONE_LOGS_TEXT=true
 DRONE_LOGS_PRETTY=true
 DRONE_LOGS_COLOR=true
 DRONE_DATABASE_DRIVER=postgres
-DRONE_DATABASE_DATASOURCE=postgres://***:***@postgres:5432/***?sslmode=disable
+DRONE_DATABASE_DATASOURCE=postgres://***:***@192.168.1.152:5432/***?sslmode=disable
 
 # gitea_drone_agent_ssh
 DRONE_RPC_HOST=drone.fedy95.com
@@ -47,11 +47,6 @@ DRONE_LOGS_TEXT=true
 DRONE_LOGS_TRACE=true
 DRONE_LOGS_PRETTY=true
 
-# gitea_drone_db
-POSTGRES_DB=
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-
 # gitea_instance
 APP_NAME=Gitea
 RUN_MODE=prod