From 2cd1b5ae12a072584d1de27fa1dcfc434fc20db7 Mon Sep 17 00:00:00 2001 From: Max Magorsch Date: Fri, 3 Jan 2020 21:54:52 +0100 Subject: 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 --- docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docker-compose.yml') 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: -- cgit v1.2.3-65-gdbad