diff --git a/.env b/.env index f5c0aba..930894e 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ -COMPOSE_FILE=docker-compose.yml;docker/dev.yml +COMPOSE_FILE_RUN=docker-compose.yml,docker-compose-run.yml +COMPOSE_FILE=${COMPOSE_FILE_RUN},docker/dev.yml COMPOSE_PROJECT_NAME=off-query -COMPOSE_PATH_SEPARATOR=; +COMPOSE_PATH_SEPARATOR=, RESTART_POLICY=no TAG=latest QUERY_PORT=127.0.0.1:5511 @@ -11,6 +12,7 @@ POSTGRES_USER=productopener POSTGRES_PASSWORD=productopener POSTGRES_SHM_SIZE=256m COMMON_NET_NAME=off_shared_network +# Note when running in a container the following settings are changed to use the internal docker network MONGO_URI=mongodb://localhost:27017 REDIS_URL=redis://localhost:6379 # Log levels are: debug, verbose, log (default), warn, error diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml index e0b6bb5..27132cd 100644 --- a/.github/workflows/container-deploy.yml +++ b/.github/workflows/container-deploy.yml @@ -133,7 +133,7 @@ jobs: echo "DOCKER_CLIENT_TIMEOUT=120" >> .env echo "COMPOSE_HTTP_TIMEOUT=120" >> .env echo "COMPOSE_PROJECT_NAME=off-query" >> .env - echo "COMPOSE_PATH_SEPARATOR=;" >> .env + echo "COMPOSE_PATH_SEPARATOR=," >> .env echo "RESTART_POLICY=always" >> .env echo "COMPOSE_FILE=docker-compose.yml" >> .env echo "TAG=sha-${{ github.sha }}" >> .env diff --git a/Makefile b/Makefile index c08a4d3..1a50e83 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ endif up: run_deps docker compose up --build --wait +# Called by other projects to start this project as a dependency +run: run_deps + COMPOSE_FILE=${COMPOSE_FILE_RUN} docker compose up -d + # This task starts a Postgres database in Docker and then prepares the local environment for development dev: run_deps docker compose up --wait query_postgres diff --git a/docker-compose-run.yml b/docker-compose-run.yml new file mode 100644 index 0000000..3c1ef64 --- /dev/null +++ b/docker-compose-run.yml @@ -0,0 +1,6 @@ +services: + query: + environment: + # Use shared-services MongoDB and REDIS + - MONGO_URI=mongodb://mongodb:27017 + - REDIS_URL=redis://redis:6379