floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

ADD ci database port

This commit is contained in:
Jasder 2020-08-17 14:29:09 +08:00
parent af220cfffc
commit a4d8338cb5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/libs/ci/drone/server.rb
View File

@ -19,7 +19,7 @@ class Ci::Drone::Server
"service docker start; docker rm -f `docker ps -qa`; docker run \ "service docker start; docker rm -f `docker ps -qa`; docker run \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-e DRONE_DATABASE_DRIVER=mysql \ -e DRONE_DATABASE_DRIVER=mysql \
-e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@#{database_host}:3306/drone?parseTime=true \ -e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@#{database_host}:#{database_port}/drone?parseTime=true \
-e DRONE_GITEA_SERVER=#{gitea_url} \ -e DRONE_GITEA_SERVER=#{gitea_url} \
-e DRONE_GITEA_CLIENT_ID=#{client_id} \ -e DRONE_GITEA_CLIENT_ID=#{client_id} \
-e DRONE_GITEA_CLIENT_SECRET=#{client_secret} \ -e DRONE_GITEA_CLIENT_SECRET=#{client_secret} \
@ -51,6 +51,10 @@ class Ci::Drone::Server
database_config[Rails.env]["ci"]["host"] database_config[Rails.env]["ci"]["host"]
end end
def database_port
database_config[Rails.env]["ci"]["port"] || 3306
end
def database def database
database_config[Rails.env]["ci"]["database"] database_config[Rails.env]["ci"]["database"]
end end

1
app/models/ci/cloud_account.rb
View File

@ -1,7 +1,6 @@
class Ci::CloudAccount < ApplicationRecord class Ci::CloudAccount < ApplicationRecord
belongs_to :project belongs_to :project
belongs_to :user belongs_to :user
belongs_to :repository, foreign_key: :repo_id
def drone_host def drone_host
[drone_ip, ":80"].join [drone_ip, ":80"].join