From 9732bffbee101d420b58c0d39c6fd85858abc28b Mon Sep 17 00:00:00 2001 From: Eric O Date: Tue, 12 Dec 2023 16:38:28 -0500 Subject: [PATCH] Test --- docker/templates/docker-compose.test.yml | 2 +- lib/tasks/dcv/docker.rake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/templates/docker-compose.test.yml b/docker/templates/docker-compose.test.yml index c3a76625..2c196d2f 100644 --- a/docker/templates/docker-compose.test.yml +++ b/docker/templates/docker-compose.test.yml @@ -28,7 +28,7 @@ services: test: ["CMD-SHELL", "curl -sf http://solr:8983/solr/dcv/admin/ping?wt=json | grep -io \"OK\" || exit 1"] start_period: 5s interval: 2s - timeout: 20s + timeout: 5s retries: 7 fedora: build: ./fedora diff --git a/lib/tasks/dcv/docker.rake b/lib/tasks/dcv/docker.rake index a605431f..2b638b1b 100644 --- a/lib/tasks/dcv/docker.rake +++ b/lib/tasks/dcv/docker.rake @@ -13,7 +13,9 @@ namespace :dcv do def wait_for_solr_cores_to_load solr_id = `docker compose -f #{Rails.root.join(docker_compose_file_path)} ps -q solr` - Timeout.timeout(120, Timeout::Error, 'Timed out during solr startup check.') do + puts "env inside container is: ${`docker exec #{solr_id} env`}" + + Timeout.timeout(5, Timeout::Error, 'Timed out during solr startup check.') do loop do sleep 0.25 status = `docker inspect --format "{{.State.Health.Status}}" #{solr_id}`.strip