Skip to content

Commit

Permalink
Merge pull request #14 from jackyko1991/master
Browse files Browse the repository at this point in the history
Update README.md for docker compose v2
  • Loading branch information
joshmoore committed Jul 28, 2023
2 parents 80aeae4 + e7f0819 commit a4a3ef9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -eu

docker-compose up -d
docker compose up -d
./wait_for_login.sh
2 changes: 1 addition & 1 deletion wait_for_login.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit a4a3ef9

Please sign in to comment.