From 236782eca8cd33a7ba71b311eff8bf731ecebc23 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Tue, 21 Jul 2020 15:07:42 +0800 Subject: [PATCH] FIX drone server command's bug --- app/libs/dev_ops/drone/api.rb | 2 +- app/libs/dev_ops/drone/client.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/libs/dev_ops/drone/api.rb b/app/libs/dev_ops/drone/api.rb index cf910fd63..c7d807860 100644 --- a/app/libs/dev_ops/drone/api.rb +++ b/app/libs/dev_ops/drone/api.rb @@ -39,7 +39,7 @@ class DevOps::Drone::API < DevOps::Drone::Request # Activate user's project with Drone CI # POST api/repos/{owner}/{name} # eq: - # DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.endpoint, project.owner.login, project.identifier).activate + # DevOps::Drone::API.new(cloud_account.drone_token, cloud_account.drone_url, project.owner.login, project.identifier).activate def activate post(endpoint, "/api/repos/#{owner}/#{repo}", drone_token: drone_token) end diff --git a/app/libs/dev_ops/drone/client.rb b/app/libs/dev_ops/drone/client.rb index dfd68e5bd..7f44f6e59 100644 --- a/app/libs/dev_ops/drone/client.rb +++ b/app/libs/dev_ops/drone/client.rb @@ -27,7 +27,7 @@ class DevOps::Drone::Client def generate_cmd "docker run -d \ -v /var/run/docker.sock:/var/run/docker.sock \ - -e DRONE_PRC_HOST=#{drone_ip}-#{client_id}:9000 \ + -e DRONE_PRC_HOST=#{drone_ip}:9000 \ -e DRONE_RPC_SECRET=#{rpc_secret} \ -e DRONE_RUNNER_NAME=#{drone_ip} \ --restart always \