ADD ci datbase config
This commit is contained in:
parent
0467119605
commit
467f278de5
|
@ -6,15 +6,16 @@ module Ci::DbConnectable
|
||||||
|
|
||||||
# Dynamically sets the database connection.
|
# Dynamically sets the database connection.
|
||||||
def connect_to_ci_database
|
def connect_to_ci_database
|
||||||
db_config = Rails.configuration.database_configuration[Rails.env]["ci_server_db"]
|
config = Rails.application.config_for(:configuration).symbolize_keys!
|
||||||
return render_error('ci database config missing') if db_config.blank?
|
db_config = config[:gitea].symbolize_keys!
|
||||||
|
raise 'ci database config missing' if db_config.blank?
|
||||||
|
|
||||||
req_params = {
|
req_params = {
|
||||||
host: db_config["host"],
|
host: db_config["host"],
|
||||||
username: db_config['username'],
|
username: db_config['username'],
|
||||||
password: db_config['password'],
|
password: db_config['password'],
|
||||||
port: db_config['port'],
|
port: db_config['port'],
|
||||||
database: "#{current_user.login}_#{db_config['database']}"
|
database: "#{current_user.login}_drone"
|
||||||
}
|
}
|
||||||
db_params = Ci::Database.get_connection_params(req_params)
|
db_params = Ci::Database.get_connection_params(req_params)
|
||||||
Ci::Database.set_connection(db_params)
|
Ci::Database.set_connection(db_params)
|
||||||
|
|
|
@ -20,7 +20,7 @@ class Ci::Drone::Server
|
||||||
"service docker start; docker run \
|
"service docker start; 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}@tcp\\(#{database_host}:#{database_port}\\)/drone_#{user_login}?parseTime=true \
|
-e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@tcp\\(#{database_host}:#{database_port}\\)/#{user_login}_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} \
|
||||||
|
|
|
@ -17,7 +17,7 @@ module Droneable
|
||||||
end
|
end
|
||||||
|
|
||||||
def ci_certification?
|
def ci_certification?
|
||||||
Ci::User.exists?(user_login: self.login)
|
devops_unverified? && Ci::User.exists?(user_login: self.login)
|
||||||
end
|
end
|
||||||
|
|
||||||
module ClassMethods
|
module ClassMethods
|
||||||
|
|
|
@ -13,4 +13,4 @@ json.user_phone_binded @user.phone.present?
|
||||||
json.profile_completed @user.profile_completed?
|
json.profile_completed @user.profile_completed?
|
||||||
json.professional_certification @user.professional_certification
|
json.professional_certification @user.professional_certification
|
||||||
json.devops_step @user.devops_step
|
json.devops_step @user.devops_step
|
||||||
json.ci_certification @user.ci_certification? if !@user.is_a?(AnonymousUser)
|
json.ci_certification @user.ci_certification? if !@user.is_a?(AnonymousUser) && @user.devops_unverified?
|
||||||
|
|
Loading…
Reference in New Issue