From 943792712fac8e6cf6440284d6660ec7c7020608 Mon Sep 17 00:00:00 2001 From: Ka Long Date: Tue, 27 Jun 2023 10:27:07 +0100 Subject: [PATCH 1/3] Update README.md upgrade for docker compose v2: https://docs.docker.com/compose/migrate/#docker-compose-vs-docker-compose --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9957cb1..7140f41 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,12 @@ The initial password can be changed in [`docker-compose.yml`](docker-compose.yml First pull the latest major versions of the containers: - docker-compose pull + docker compose pull Then start the containers: - docker-compose up -d - docker-compose logs -f + docker compose up -d + docker compose logs -f For more configuration options see: - https://github.com/ome/omero-server-docker/blob/master/README.md From 76a3c8558e69882920b3d3265eff1864e1d64484 Mon Sep 17 00:00:00 2001 From: Ka Long Date: Fri, 28 Jul 2023 16:48:28 +0100 Subject: [PATCH 2/3] Update test.sh docker compose v2 --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index adfad8e..8c7f1f1 100755 --- a/test.sh +++ b/test.sh @@ -1,5 +1,5 @@ #!/bin/sh set -eu -docker-compose up -d +docker compose up -d ./wait_for_login.sh From e7f0819b95076531e99140bed96a80b912d500e8 Mon Sep 17 00:00:00 2001 From: Ka Long Date: Fri, 28 Jul 2023 16:48:50 +0100 Subject: [PATCH 3/3] Update wait_for_login.sh docker compose v2 --- wait_for_login.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wait_for_login.sh b/wait_for_login.sh index c43a0ad..d5bc116 100755 --- a/wait_for_login.sh +++ b/wait_for_login.sh @@ -7,5 +7,5 @@ OMERO_PASS=omero OMERO=/opt/omero/server/OMERO.server/bin/omero # Wait up to 2 mins -docker-compose exec -T omeroserver $OMERO login -C -s localhost -u "$OMERO_USER" -q -w "$OMERO_PASS" --retry 120 +docker compose exec -T omeroserver $OMERO login -C -s localhost -u "$OMERO_USER" -q -w "$OMERO_PASS" --retry 120 echo "OMERO.server connection established"