From 2e3c647591430d6ab6fa2f271df5a8f3f66c314b Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Tue, 25 Jan 2022 12:42:24 -0700 Subject: [PATCH] Use `test` image tag for docker-compose tests Also adds the ability to overwrite the image in docker-compose.yml, which allows the CI build to use the same image for all docker tests. The default is still 'benbusby/whoogle-search' though. --- .github/workflows/docker_main.yml | 2 +- .github/workflows/docker_tests.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index c4ab678..c41b693 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -23,6 +23,6 @@ jobs: - name: build and test (docker-compose) run: | docker rm -f whoogle-search-nocompose - docker-compose up --detach + WHOOGLE_IMAGE="whoogle-search:test" docker-compose up --detach sleep 15 docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1 diff --git a/.github/workflows/docker_tests.yml b/.github/workflows/docker_tests.yml index 7eabdd9..52d1222 100644 --- a/.github/workflows/docker_tests.yml +++ b/.github/workflows/docker_tests.yml @@ -21,6 +21,6 @@ jobs: - name: build and test (docker-compose) run: | docker rm -f whoogle-search-nocompose - docker-compose up --detach + WHOOGLE_IMAGE="whoogle-search:test" docker-compose up --detach sleep 15 docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1 diff --git a/docker-compose.yml b/docker-compose.yml index c26f412..676a03c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: "2.4" services: whoogle-search: - image: benbusby/whoogle-search + image: ${WHOOGLE_IMAGE:-benbusby/whoogle-search} container_name: whoogle-search restart: unless-stopped pids_limit: 50