docker-stack 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/docker/stack/version.rb +1 -1
  3. data/lib/generators/docker/stack/service/fedora_generator.rb +1 -1
  4. data/lib/generators/docker/stack/service/postgres_generator.rb +1 -1
  5. data/lib/generators/docker/stack/service/redis_generator.rb +1 -1
  6. data/lib/generators/docker/stack/service/solr_generator.rb +1 -1
  7. data/lib/generators/docker/stack/templates/config/{database.yml → database.yml.erb} +3 -2
  8. data/lib/generators/docker/stack/templates/config/{fedora.yml → fedora.yml.erb} +2 -2
  9. data/lib/generators/docker/stack/templates/config/redis.yml.erb +9 -0
  10. data/lib/generators/docker/stack/templates/config/solr.yml.erb +7 -0
  11. metadata +5 -5
  12. data/lib/generators/docker/stack/templates/config/redis.yml +0 -9
  13. data/lib/generators/docker/stack/templates/config/solr.yml +0 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4a1ce997289fb1239f20592606157841e75e1fbf784e78a20e6f11d96f243c19
4
- data.tar.gz: '0924e1a20ce9e5ca2184a787bd4a9b271291d3528a906391d3a05574e51eda98'
3
+ metadata.gz: 65e2f003c667b95cdfdade4066005b3f444ad354dc8d38b6d995c0265049f9f9
4
+ data.tar.gz: 4f24e6d61b246999a575015af732604b7446d640b98caa8ef5173b823f15e04f
5
5
  SHA512:
6
- metadata.gz: 14a516ea47222eecf2c5137ee278dcf4a16f044efe2b28224718e13547c69e8a7f5ef8c16b5ab6b844f1f89acf1f4ce080652480c6c40ce8af6b217e5ebfdd5f
7
- data.tar.gz: 5fd5a24eb7cc3dcc031ec6961b09bb10472f1dc1127056f73d17392843a4dfa43c2060c7d04652bc93c31b08d5512e8a797508c0bab2a6641b3482f1e1229bc8
6
+ metadata.gz: 8f930bcead320565638a1b3d9b829836c631a9c5f4446c778fb083133381b4d8c15a898ecb7cf6938efc5788e95fbede5045389339c78dd8bbb3b826eed8913c
7
+ data.tar.gz: 414065c75f75b41bacb557e394ede4b7bafeaced01d1a1da9a85cf8ac7ab6f64260d05450f94af3f7a4e91c3812d05c3e1e517abf5b43dab267fef0055135f17
data/lib/docker/stack/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Docker
4
4
  module Stack
5
- VERSION = '0.2.3'
5
+ VERSION = '0.2.4'
6
6
  end
7
7
  end
data/lib/generators/docker/stack/service/fedora_generator.rb CHANGED
@@ -14,7 +14,7 @@ module Docker
14
14
  )
15
15
 
16
16
  def install_service
17
- copy_file 'config/fedora.yml', 'config/fedora.yml'
17
+ template 'config/fedora.yml.erb', 'config/fedora.yml'
18
18
  end
19
19
  end
20
20
  end
data/lib/generators/docker/stack/service/postgres_generator.rb CHANGED
@@ -15,7 +15,7 @@ module Docker
15
15
  )
16
16
 
17
17
  def install_service
18
- copy_file 'config/database.yml', 'config/database.yml'
18
+ template 'config/database.yml.erb', 'config/database.yml'
19
19
  gem 'pg'
20
20
  end
21
21
  end
data/lib/generators/docker/stack/service/redis_generator.rb CHANGED
@@ -14,7 +14,7 @@ module Docker
14
14
  )
15
15
 
16
16
  def install_service
17
- copy_file 'config/redis.yml', 'config/redis.yml'
17
+ template 'config/redis.yml.erb', 'config/redis.yml'
18
18
  end
19
19
  end
20
20
  end
data/lib/generators/docker/stack/service/solr_generator.rb CHANGED
@@ -15,7 +15,7 @@ module Docker
15
15
  )
16
16
 
17
17
  def install_service
18
- copy_file 'config/solr.yml', 'config/solr.yml'
18
+ template 'config/solr.yml.erb', 'config/solr.yml'
19
19
  directory 'solr'
20
20
  end
21
21
  end
data/lib/generators/docker/stack/templates/config/{database.yml → database.yml.erb} RENAMED
@@ -1,7 +1,6 @@
1
1
  default: &default
2
2
  adapter: postgresql
3
3
  host: localhost
4
- port: <%= Docker::Stack.port_for(:postgres) %>
5
4
  encoding: unicode
6
5
  pool: 5
7
6
  username: docker
@@ -9,14 +8,16 @@ default: &default
9
8
 
10
9
  development:
11
10
  <<: *default
11
+ port: <%= Docker::Stack.port_for(:postgres, 'development') %>
12
12
  database: docker_dev
13
13
 
14
14
  test:
15
15
  <<: *default
16
+ port: <%%= Rails.env.development? ? <%= Docker::Stack.port_for(:postgres, 'development') %> : <%= Docker::Stack.port_for(:postgres, 'test') %> %>
16
17
  database: docker_test
17
18
 
18
19
  production:
19
20
  adapter: sqlite3
20
- pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
21
+ pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
21
22
  timeout: 5000
22
23
  database: db/production.sqlite3
data/lib/generators/docker/stack/templates/config/{fedora.yml → fedora.yml.erb} RENAMED
@@ -1,12 +1,12 @@
1
1
  development:
2
2
  user: fedoraAdmin
3
3
  password: fedoraAdmin
4
- url: http://127.0.0.1:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || Docker::Stack::port_for(:fedora) %>/rest
4
+ url: http://127.0.0.1:<%%= ENV['FCREPO_DEVELOPMENT_PORT'] || <%= Docker::Stack::port_for(:fedora, 'development') %> %>/rest
5
5
  base_path: /dev
6
6
  test:
7
7
  user: fedoraAdmin
8
8
  password: fedoraAdmin
9
- url: http://127.0.0.1:<%= ENV['FCREPO_TEST_PORT'] || Docker::Stack::port_for(:fedora) %>/rest
9
+ url: http://127.0.0.1:<%%= ENV['FCREPO_TEST_PORT'] || <%= Docker::Stack::port_for(:fedora, 'test') %> %>/rest
10
10
  base_path: /test
11
11
  production:
12
12
  user: fedoraAdmin
data/lib/generators/docker/stack/templates/config/redis.yml.erb ADDED
@@ -0,0 +1,9 @@
1
+ development:
2
+ host: localhost
3
+ port: <%= Docker::Stack.port_for(:redis, 'development') %>
4
+ test:
5
+ host: localhost
6
+ port: <%= Docker::Stack.port_for(:redis, 'test') %>
7
+ production:
8
+ host: <%%= ENV['REDIS_HOST'] || 'localhost' %>
9
+ port: <%%= ENV['REDIS_PORT'] || 6379 %>
data/lib/generators/docker/stack/templates/config/solr.yml.erb ADDED
@@ -0,0 +1,7 @@
1
+ # This is a sample config file that points to a solr server for each environment
2
+ development:
3
+ url: http://127.0.0.1:<%%= ENV['SOLR_TEST_PORT'] || <%= Docker::Stack.port_for(:solr, 'development') %> %>/solr/development-core
4
+ test:
5
+ url: http://127.0.0.1:<%%= ENV['SOLR_TEST_PORT'] || <%= Docker::Stack.port_for(:solr, 'test') %> %>/solr/test-core
6
+ production:
7
+ url: http://127.0.0.1:8983/solr/donut
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-stack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Klein
@@ -225,11 +225,11 @@ files:
225
225
  - lib/generators/docker/stack/service/postgres_generator.rb
226
226
  - lib/generators/docker/stack/service/redis_generator.rb
227
227
  - lib/generators/docker/stack/service/solr_generator.rb
228
- - lib/generators/docker/stack/templates/config/database.yml
229
- - lib/generators/docker/stack/templates/config/fedora.yml
228
+ - lib/generators/docker/stack/templates/config/database.yml.erb
229
+ - lib/generators/docker/stack/templates/config/fedora.yml.erb
230
230
  - lib/generators/docker/stack/templates/config/initializers/localstack_stub.rb
231
- - lib/generators/docker/stack/templates/config/redis.yml
232
- - lib/generators/docker/stack/templates/config/solr.yml
231
+ - lib/generators/docker/stack/templates/config/redis.yml.erb
232
+ - lib/generators/docker/stack/templates/config/solr.yml.erb
233
233
  - lib/generators/docker/stack/templates/docker.rake
234
234
  - lib/generators/docker/stack/templates/services/fedora.yml.erb
235
235
  - lib/generators/docker/stack/templates/services/localstack.yml.erb
data/lib/generators/docker/stack/templates/config/redis.yml DELETED
@@ -1,9 +0,0 @@
1
- development:
2
- host: localhost
3
- port: Docker::Stack.port_for(:redis)
4
- test:
5
- host: localhost
6
- port: Docker::Stack.port_for(:redis)
7
- production:
8
- host: <%= ENV['REDIS_HOST'] || 'localhost' %>
9
- port: <%= ENV['REDIS_PORT'] || 6379 %>
data/lib/generators/docker/stack/templates/config/solr.yml DELETED
@@ -1,7 +0,0 @@
1
- # This is a sample config file that points to a solr server for each environment
2
- development:
3
- url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || Docker::Stack.port_for(:solr) %>/solr/development-core
4
- test:
5
- url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || Docker::Stack.port_for(:solr) %>/solr/test-core
6
- production:
7
- url: http://127.0.0.1:8983/solr/donut