diff options
| author |   Max Magorsch <max@magorsch.de> | 2020-01-03 21:54:52 +0100 |
|---|---|---|
| committer | Max Magorsch <max@magorsch.de> | 2020-01-03 21:54:52 +0100 |
| commit | 2cd1b5ae12a072584d1de27fa1dcfc434fc20db7 (patch) | |
| tree | ae612f391665ca5df8ea0962ec48a089bafe2bb3 | |
| parent | Update the copyright notice (diff) | |
| download | packages-5-2cd1b5ae12a072584d1de27fa1dcfc434fc20db7.tar.gz packages-5-2cd1b5ae12a072584d1de27fa1dcfc434fc20db7.tar.bz2 packages-5-2cd1b5ae12a072584d1de27fa1dcfc434fc20db7.zip | |
Fix an issue in the docker-compose files
Replace the kkuleomi_config.rb file by the kkuleomi_config.rb.dist file,
when using docker-compose.yml or docker-compose.override.yml.
This is important as kkuleomi_config.rb is replaced by the
kkuleomi_config.rb.test whenever the tests are executed.
Consequently it is important to apply the kkuleomi_config.rb.dist
file again after the test have been run i.e. when running
docker-compose.yml or docker-compose.override.yml.
Signed-off-by: Max Magorsch <max@magorsch.de>
| -rw-r--r-- | docker-compose.override.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b85830f..287112b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -46,7 +46,7 @@ services: depends_on: - redis - elasticsearch - command: bash -c "/var/www/packages.gentoo.org/htdocs/bin/first-run development" + command: bash -c "cp config/initializers/kkuleomi_config.rb.dist config/initializers/kkuleomi_config.rb && /var/www/packages.gentoo.org/htdocs/bin/first-run development" sidekiq: image: gentoo/gpackages:latest build: . diff --git a/docker-compose.yml b/docker-compose.yml index b9d5848..c662d13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: depends_on: - redis - elasticsearch - command: bash -c "/var/www/packages.gentoo.org/htdocs/bin/first-run production" + command: bash -c "cp config/initializers/kkuleomi_config.rb.dist config/initializers/kkuleomi_config.rb && /var/www/packages.gentoo.org/htdocs/bin/first-run production" sidekiq: image: gentoo/gpackages:latest build: . @@ -64,7 +64,9 @@ services: depends_on: - redis - elasticsearch - command: bundle exec sidekiq -c 5 + command: > + bash -c " cp config/initializers/kkuleomi_config.rb.dist config/initializers/kkuleomi_config.rb && bundler install && yarn install --check-files + && bundle exec sidekiq -c 5" memcache: image: memcached:latest ports: |