From 361cf2d4074e0a3d18a5fa31ba50ab3da9d8301e Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 4 Jun 2021 13:14:34 +0800
Subject: [PATCH] test

---
 .drone.yml         | 4 ++--
 docker-compose.yml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9783cc9..2fdd9c3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,7 +21,7 @@ steps:
       username: root
       password:
         from_secret: ssh_password
-      target: /root/publish/cicd
+      target: ~/publish/cicd/~/publish
       source: docker-compose.yml
   - name: restart
     image: appleboy/drone-ssh:linux-amd64
@@ -32,7 +32,7 @@ steps:
       password:
         from_secret: ssh_password
       script:
-        - cd ~/publish/cicd
+        - cd ~/publish/cicd/publish
         - ./start.sh
         # - apt -y install git
         # - mkdir -p ~/publish/cicd && cd $_
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e33dfc..82069a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
             - 9000:9000
         volumes:
             - ${DOCKER_SOCK}:/var/run/docker.sock
-            - ./data/portainer:/data
+            - ../data/portainer:/data
     netdata:
         image: netdata/netdata:v1.30.0
         restart: always
@@ -39,7 +39,7 @@ services:
         ports:
             - 5000:5000 #http://localhost:5000/v2/_catalog
         volumes:
-            - ./data/registry:/var/lib/registry
+            - ../data/registry:/var/lib/registry
     docker-registry-ui:
         image: joxit/docker-registry-ui:2.0
         restart: always
@@ -64,9 +64,8 @@ services:
         volumes:
             - /etc/timezone:/etc/timezone:ro
             - /etc/localtime:/etc/localtime:ro
-            - /home/git/.ssh/:/data/git/.ssh
             - ./conf/gitea/custom:/data/gitea/custom
-            - ./data/gitea:/data
+            - ../data/gitea:/data
     drone: #https://docs.drone.io/server/provider/gitea/ https://github.com/drone/drone
         image: drone/drone:2.0.1
         restart: always
@@ -82,7 +81,7 @@ services:
             - DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO}
             - DRONE_USER_CREATE=username:root,machine:false,admin:true,token:55f24eb3d61ef6ac5e83d550178638dc
         volumes:
-            - ./data/drone:/data
+            - ../data/drone:/data
         depends_on:
             - gitea
             - registry