diff options
| author | Alban Peignier | 2018-03-09 15:28:35 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-03-09 15:28:39 +0100 |
| commit | 665727fc7392de55bb19b8f9ccac90b068e86ba5 (patch) | |
| tree | cec88605d422c59566c0e808f968c2329941c4d4 /config | |
| parent | 523d3e418539cfe6af98bdcbae82d1f7d3fdd3c0 (diff) | |
| download | chouette-core-665727fc7392de55bb19b8f9ccac90b068e86ba5.tar.bz2 | |
Create ci:build, ci:docker and ci:docker:clean. Rename config/database/jenkins.yml in ci.yml. Refs #6047
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 33 | ||||
| -rw-r--r-- | config/database/jenkins.yml | 8 |
2 files changed, 8 insertions, 33 deletions
diff --git a/config/database.yml b/config/database.yml index 60f1d032f..25a46be1b 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,28 +1,11 @@ -default: &default - adapter: postgis +test: + adapter: <%= ENV.fetch 'RAILS_DB_ADAPTER', 'postgis' %> encoding: unicode - port: 5432 - host: localhost + pool: <%= ENV.fetch 'RAILS_DB_POOLSIZE', '5' %> + host: <%= ENV.fetch 'RAILS_DB_HOST', 'localhost' %> + port: <%= ENV.fetch 'RAILS_DB_PORT', '5432' %> schema_search_path: 'public,shared_extensions' - username: chouette - password: chouette postgis_schema: 'shared_extensions' - -development: - <<: *default - database: chouette2 - -# 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: &test - <<: *default - database: chouette_test - -production: - <<: *default - adapter: <%= ENV.fetch 'RAILS_DB_ADAPTER', 'postgis' %> - database: chouette2 - -cucumber: - <<: *test + database: <%= ENV.fetch 'RAILS_DB_NAME', 'stif_boiv_test' %> + username: <%= ENV['RAILS_DB_USER'] || ENV['POSTGRESQL_ENV_POSTGRES_USER'] || 'jenkins' %> + password: <%= ENV.fetch 'RAILS_DB_PASSWORD' || ENV['POSTGRESQL_ENV_POSTGRES_PASSWORD'] %> diff --git a/config/database/jenkins.yml b/config/database/jenkins.yml deleted file mode 100644 index 8b7a8ef2f..000000000 --- a/config/database/jenkins.yml +++ /dev/null @@ -1,8 +0,0 @@ -test: - adapter: postgis - encoding: unicode - schema_search_path: 'public,shared_extensions' - postgis_schema: 'shared_extensions' - username: <%= ENV['POSTGRESQL_ENV_POSTGRES_USER'] || 'jenkins' %> - password: <%= ENV['POSTGRESQL_ENV_POSTGRES_PASSWORD'] %> - database: stif_boiv_test |