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

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

diff --git a/.drone.yml b/.drone.yml
index 1d04d352..04fd065e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -49,11 +49,16 @@ steps:
         path: /var/run/docker.sock
     commands:
       - docker login -u $DOCKER_REG_USERNAME -p $DOCKER_REG_PASSWORD https://docker.zcj.plus
-      - docker-compose up -f /drone/src/docker-compose.yml -d 
+      - docker-compose up -d
       - docker-compose logs -f
+      - docker cp frpc.ini fe_frpc:/etc/frp/frpc.ini
+      - docker restart fe_frpc
 
 
 volumes:
+  - name: frpc
+    host:
+      path: /mnt/d/ci_volumes/frpc_config/fe_drone.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 655fb732..249527cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,10 +9,11 @@ services:
 
   frpc:
     image: snowdreamtech/frpc
+    container_name: fe_frpc
     networks: 
       - feadmindroneci
-    volumes: 
-      - ./frpc.ini:/etc/frp/frpc.ini
+    # volumes: 
+    #   - ./frpc.ini:/etc/frp/frpc.ini
     depends_on: 
       - web
     restart: always