From 94c7a92e1ce0fec2efe6a37cfa2b2e11e966a24b Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sun, 8 Nov 2020 17:35:00 +0300
Subject: [PATCH] test-drone-triggers

---
 .drone.yml         | 16 +++++++++++++++-
 .env-services-dist | 10 ++++++++--
 .gitignore         |  2 +-
 docker-compose.yml | 13 +++++--------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 66c55d6..10ccb3d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,13 +1,27 @@
 kind: pipeline
+type: ssh
 name: default
 
+server:
+    host:
+        from_secret: host
+    user:
+        from_secret: user
+    ssh_key:
+        from_secret: ssh_key
+    password:
+        from_secret: password
+
 steps:
     - name: release
       commands:
           - date
+#          - cd /mnt/md0/infra/gitea
+#          - git pull
+#          - make restart
 
 trigger:
     branch:
         - master
     event:
-        - push
+        - push
\ No newline at end of file
diff --git a/.env-services-dist b/.env-services-dist
index a7f05be..e279221 100644
--- a/.env-services-dist
+++ b/.env-services-dist
@@ -21,13 +21,19 @@ DRONE_LOGS_COLOR=true
 DRONE_DATABASE_DRIVER=postgres
 DRONE_DATABASE_DATASOURCE=postgres://***:***@postgres:5432/***?sslmode=disable
 
-# gitea_drone_agent
+# gitea_drone_agent_ssh
 DRONE_RPC_HOST=drone.fedy95.com
 DRONE_RPC_SECRET=***
 DRONE_RUNNER_CAPACITY=5
-DRONE_RUNNER_NAME=gitea_drone_agent
+DRONE_RUNNER_NAME=gitea_drone_agent_ssh
 DRONE_RPC_PROTO=https
 
+DRONE_LOGS_COLOR=true
+DRONE_LOGS_DEBUG=true
+DRONE_LOGS_TEXT=true
+DRONE_LOGS_TRACE=true
+DRONE_LOGS_PRETTY=true
+
 # gitea_drone_db
 POSTGRES_DB=
 POSTGRES_USER=
diff --git a/.gitignore b/.gitignore
index 5045575..9af144d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /etc
 /.env-gitea_db
 /.env-gitea_drone
-/.env-gitea_drone_agent
+/.env-gitea_drone_agent_ssh
 /.env-gitea_drone_db
 /.env-gitea_instance
diff --git a/docker-compose.yml b/docker-compose.yml
index e9c1774..fbb2b20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,20 +41,17 @@ services:
 
         volumes:
             - ./etc/gitea_drone_db/data:/var/lib/postgresql/data
-    gitea_drone_agent:
-        image: drone/drone-runner-docker:1.5
-        container_name: gitea_drone_agent
+    gitea_drone_agent_ssh:
+        image: drone/drone/drone-runner-ssh:1
+        container_name: gitea_drone_agent_ssh
 
-        hostname: gitea_drone_agent
+        hostname: gitea_drone_agent_ssh
         restart: always
         depends_on:
             - gitea_drone
 
         env_file:
-            - ./.env-gitea_drone_agent
-
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
+            - ./.env-gitea_drone_agent_ssh
     gitea_instance:
         image: gitea/gitea:1.12.5
         container_name: gitea_instance