From ce9a74411ee6d8e46a2dcdb6985acbbd15112d4b Mon Sep 17 00:00:00 2001
From: 13078417792 <397201698@qq.com>
Date: Sun, 6 Jun 2021 12:52:08 +0800
Subject: [PATCH] update

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

diff --git a/.drone.yml b/.drone.yml
index 14b5c3f1..58fe6db9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,7 +38,6 @@ steps:
 
   - name: deploy
     image: docker/compose
-    privileged: true
     environment:
       DOCKER_REG_USERNAME: 
         from_secret: docker_reg_username
@@ -47,15 +46,19 @@ steps:
     volumes:
       - name: dockersock
         path: /var/run/docker.sock
+      - name: frpc
+        path: ./frpc.ini
     commands:
       - docker login -u $DOCKER_REG_USERNAME -p $DOCKER_REG_PASSWORD https://docker.zcj.plus
       - docker-compose up -d
-      - docker-compose logs
-      - docker cp frpc.ini fe_frpc:/etc/frp/frpc.ini
-      - docker restart fe_frpc
+      # - docker cp frpc.ini fe_frpc:/etc/frp/frpc.ini
+      # - docker restart fe_frpc
 
 
 volumes:
+  - name: frpc
+    host:
+      path: /mnt/d/ci_volumes/frpc_ini/fe.ini
   - name: dockersock
     host:
       path: /var/run/docker.sock
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 249527cd..0fcb65d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@ services:
     container_name: fe_frpc
     networks: 
       - feadmindroneci
-    # volumes: 
-    #   - ./frpc.ini:/etc/frp/frpc.ini
+    volumes: 
+      - frpc:/etc/frp/frpc.ini
     depends_on: 
       - web
     restart: always