From 366e9554a7c1f8e95d847c0ea8950e84a2a17f94 Mon Sep 17 00:00:00 2001 From: W Beecher Baker Date: Thu, 21 Nov 2024 09:36:05 -0500 Subject: [PATCH] docker-compose -> docker compose --- .github/docker-tests/{docker-compose.yml => compose.yml} | 1 - docker-compose.yml => compose.yml | 4 ++-- exe/docker_compose_start.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename .github/docker-tests/{docker-compose.yml => compose.yml} (99%) rename docker-compose.yml => compose.yml (94%) diff --git a/.github/docker-tests/docker-compose.yml b/.github/docker-tests/compose.yml similarity index 99% rename from .github/docker-tests/docker-compose.yml rename to .github/docker-tests/compose.yml index a2b5d27c28..85116697a1 100644 --- a/.github/docker-tests/docker-compose.yml +++ b/.github/docker-tests/compose.yml @@ -1,4 +1,3 @@ -version: "2.1" services: taxonworks: build: ./docker-image-taxonworks diff --git a/docker-compose.yml b/compose.yml similarity index 94% rename from docker-compose.yml rename to compose.yml index 06b22e4331..6adb1a319c 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -1,7 +1,6 @@ # -# docker-compose targets development only +# docker compose targets development only # -version: '2' services: app: build: @@ -30,6 +29,7 @@ services: - '0.0.0.0:15432:5432' volumes: - pg12:/var/lib/postgresql/data + - ./unzip:/mnt/unzip webpack: build: context: . diff --git a/exe/docker_compose_start.sh b/exe/docker_compose_start.sh index aad8cf03f2..f4ee557457 100755 --- a/exe/docker_compose_start.sh +++ b/exe/docker_compose_start.sh @@ -13,7 +13,7 @@ function wait_for_db() { done } # Could do sanity check of environment here -# * Raise a warning of the database.yml file looks like it is setup for docker-compose +# * Raise a warning if the database.yml file looks like it is setup for docker compose wait_for_db "postgres10_legacy" wait_for_db "db"