docker部署整理

config/database.yml.example

@@ -1,62 +1,29 @@
-# MySQL. Versions 5.1.10 and up are supported.
-#
-# Install the MySQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
-#
 default: &default
   adapter: mysql2
-  host: 127.0.0.1
+  host: <%= ENV.fetch("MYSQL_HOST") { '127.0.0.1' } %>
   encoding: utf8mb4
   reconnect: true
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: root
-  password: 123456
-#  socket: /var/run/mysqld/mysqld.sock
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 20 } %>
+  username: <%= ENV.fetch("MYSQL_USER") { 'root' } %>
+  password: <%= ENV.fetch("MYSQL_PWD") { '123456' } %>
+  wait_timeout: 10
   gitea_server:
     adapter: mysql2
-    database: gitea_development
-    host: 127.0.0.1
-    username: root
-    password: "123456"
+    database: <%= ENV.fetch("MYSQL_DB_GITEA") { 'gitea' } %>
+    host: <%= ENV.fetch("MYSQL_HOST") { '127.0.0.1' } %>
+    username: <%= ENV.fetch("MYSQL_USER") { 'root' } %>
+    password: <%= ENV.fetch("MYSQL_PWD") { '123456' } %>
     encoding: utf8
 
 development:
   <<: *default
   host: 127.0.0.1
-  database: forge_development
+  database: forgeplus_development
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: forge_test
+  database: forgeplus_test
 
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
 production:
   <<: *default
-  database: forge_production
+  database: <%= ENV.fetch("MYSQL_DB") { 'forgeplus' } %>