| Revision | cbac76746ae55b8cf5386916ed3f3d2198701b3d (tree) |
|---|---|
| Zeit | 2018-02-03 22:49:51 |
| Autor | whitestar <whitestar@user...> |
| Commiter | whitestar |
adds PostgreSQL support.
cookbooks/screwdriver/CHANGELOG.md (diff) cookbooks/screwdriver/README.md (diff) cookbooks/screwdriver/attributes/default.rb (diff) cookbooks/screwdriver/recipes/docker-compose.rb (diff) cookbooks/screwdriver/version (diff)| @@ -1,5 +1,10 @@ | ||
| 1 | 1 | # screwdriver CHANGELOG |
| 2 | 2 | |
| 3 | +0.5.0 | |
| 4 | +----- | |
| 5 | +- adds PostgreSQL support. | |
| 6 | +- fixes typo. | |
| 7 | + | |
| 3 | 8 | 0.4.0 |
| 4 | 9 | ----- |
| 5 | 10 | - adds MySQL support. |
| @@ -656,6 +656,7 @@ override_attributes( | ||
| 656 | 656 | |
| 657 | 657 | If you use database other than sqlite, its database initialization will takes a few tens of seconds. |
| 658 | 658 | You should run a database container only at the beginning and then start the others. |
| 659 | + | |
| 659 | 660 | ``` |
| 660 | 661 | $ sudo docker-compose up -d db |
| 661 | 662 | ... |
| @@ -418,6 +418,21 @@ when 'mysql' | ||
| 418 | 418 | #'MYSQL_DATABASE' => 'screwdriver', |
| 419 | 419 | }, |
| 420 | 420 | } |
| 421 | +when 'postgres' | |
| 422 | + version_2_config['services']['db'] = { | |
| 423 | + 'image' => 'postgres:9', | |
| 424 | + 'volumes' => [ | |
| 425 | + # This variable will be set by the screwdriver::docker-compose recipe automatically. | |
| 426 | + #"#{node['screwdriver']['docker-compose']['data_dir']}/postgres:/database:rw", | |
| 427 | + ], | |
| 428 | + 'environment' => { | |
| 429 | + # These variables will be set by the screwdriver::docker-compose recipe automatically. | |
| 430 | + #'POSTGRES_USER' => '${DB_USERNAME}', | |
| 431 | + #'POSTGRES_PASSWORD' => '${DB_PASSWORD}', | |
| 432 | + #'POSTGRES_DB' => 'screwdriver', | |
| 433 | + #'PGDATA' => '/database', | |
| 434 | + }, | |
| 435 | + } | |
| 421 | 436 | end |
| 422 | 437 | |
| 423 | 438 | default['screwdriver']['docker-compose']['config'] = version_2_config |
| @@ -244,7 +244,7 @@ case db_dialect | ||
| 244 | 244 | when 'sqlite' |
| 245 | 245 | api_vols.push("#{data_dir}:/sd-data:rw") |
| 246 | 246 | api_envs['DATASTORE_SEQUELIZE_STORAGE'] = '/sd-data/storage.db' |
| 247 | -when 'mysql' | |
| 247 | +when 'mysql', 'postgres' | |
| 248 | 248 | override_config_srvs['api']['links'] = ['db'] |
| 249 | 249 | api_envs['DATASTORE_SEQUELIZE_HOST'] = 'db' |
| 250 | 250 | end |
| @@ -270,6 +270,20 @@ if db_dialect != 'sqlite' | ||
| 270 | 270 | db_envs['MYSQL_PASSWORD'] = '${DB_PASSWORD}' unless db_password.nil? |
| 271 | 271 | db_envs['MYSQL_ROOT_PASSWORD'] = '${DB_ROOT_PASSWORD}' unless db_root_password.nil? |
| 272 | 272 | db_vols.push("#{mysql_data_dir}:/var/lib/mysql:rw") |
| 273 | + when 'postgres' | |
| 274 | + pg_data_dir = "#{data_dir}/postgres" | |
| 275 | + resources(directory: pg_data_dir) rescue directory pg_data_dir do | |
| 276 | + owner 'root' | |
| 277 | + group 'root' | |
| 278 | + mode '0755' | |
| 279 | + recursive true | |
| 280 | + end | |
| 281 | + | |
| 282 | + db_envs['POSTGRES_DB'] = api_envs_org['DATASTORE_SEQUELIZE_DATABASE'] | |
| 283 | + db_envs['POSTGRES_USER'] = '${DB_USERNAME}' unless db_username.nil? | |
| 284 | + db_envs['POSTGRES_PASSWORD'] = '${DB_PASSWORD}' unless db_password.nil? | |
| 285 | + db_envs['PGDATA'] = '/database' | |
| 286 | + db_vols.push("#{pg_data_dir}:/database:rw") | |
| 273 | 287 | end |
| 274 | 288 | end |
| 275 | 289 |
| @@ -1 +1 @@ | ||
| 1 | -0.4.0 | |
| 1 | +0.5.0 |
Fork