FIX update devops process

This commit is contained in:
Jasder
2020-08-06 14:26:19 +08:00
parent 0b9a69ec56
commit 69ea60dfd5
14 changed files with 276 additions and 23 deletions

View File

@@ -20,6 +20,6 @@ class DevOps::Drone::Ci
private
def cmd
"cd ..; cd var/lib/drone/; sqlite3 database.sqlite; .dump; select user_hash from users where user_login=#{gitea_username} "
"cd ..; cd var/lib/drone/; sqlite3 database.sqlite; .dump; select user_hash from users where user_login=#{gitea_username};"
end
end

View File

@@ -18,7 +18,8 @@ class DevOps::Drone::Server
def generate_cmd
"service docker start; docker rm -f `docker ps -qa`; docker run \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /var/lib/drone:/data \
-e DRONE_DATABASE_DRIVER=mysql \
-e DRONE_DATABASE_DATASOURCE=#{database_username}:#{database_password}@#{database_host}:3306/drone?parseTime=true \
-e DRONE_GITEA_SERVER=#{gitea_url} \
-e DRONE_GITEA_CLIENT_ID=#{client_id} \
-e DRONE_GITEA_CLIENT_SECRET=#{client_secret} \
@@ -37,4 +38,24 @@ class DevOps::Drone::Server
def gitea_url
Gitea.gitea_config[:domain]
end
def database_username
database_config[Rails.env]["username"]
end
def database_password
database_config[Rails.env]["password"]
end
def database_host
database_config[Rails.env]["host"]
end
def database
database_config[Rails.env]["database"]
end
def database_config
Rails.configuration.database_configuration
end
end