From 370c12b74b39db6719a3d5acd1b2c3185062a07e Mon Sep 17 00:00:00 2001 From: dashan Date: Sun, 26 Nov 2023 05:52:20 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 961a2db..726deea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,12 +18,13 @@ steps: - cp -r docker /mnt/app/build/ - name: build-docker - image: dashan/docker-compose:v1 + image: plugins/docker volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 - name: maven-build path: /mnt/app/build # 将应用打包好的Jar和执行脚本挂载出来 - name: docker path: /var/run/docker.sock # 挂载宿主机的docker + - /usr/local/bin/docker-compose:/usr/local/bin/docker-compose #settings: # dockerfile: /mnt/app/build/Dockerfile commands: # 定义在Docker容器中执行的shell命令 From b9f839f72cd56e63107f9929bc31736a2d0903c9 Mon Sep 17 00:00:00 2001 From: dashan Date: Sun, 26 Nov 2023 05:55:44 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 726deea..26bb9ef 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,8 @@ steps: path: /mnt/app/build # 将应用打包好的Jar和执行脚本挂载出来 - name: docker path: /var/run/docker.sock # 挂载宿主机的docker - - /usr/local/bin/docker-compose:/usr/local/bin/docker-compose + - name: dockerc + path: /usr/local/bin/docker-compose #settings: # dockerfile: /mnt/app/build/Dockerfile commands: # 定义在Docker容器中执行的shell命令 @@ -44,4 +45,7 @@ volumes: # 定义流水线挂载目录，用于共享数据 path: /www/mnt/maven/cache - name: docker host: - path: /var/run/docker.sock \ No newline at end of file + path: /var/run/docker.sock + - name: dockerc + host: + path: /usr/local/bin/docker-compose \ No newline at end of file From b2955ad50c428891df5aa20caed58f9123c405e6 Mon Sep 17 00:00:00 2001 From: dashan Date: Sun, 26 Nov 2023 06:02:51 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 26bb9ef..51f049c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - chmod +x deploy.sh - sh deploy.sh stop - sh deploy.sh rm - - sh deploy.sh module + - sh deploy.sh modules - docker ps volumes: # 定义流水线挂载目录，用于共享数据