Drop use of old style "docker-compose" in favour "docker compose" everywhere

pull/55/head
Dan Caseley 2022-06-26 23:11:46 +01:00 committed by Guus der Kinderen
parent f9e5e43506
commit 346a4e4005
4 changed files with 4 additions and 4 deletions

View File

@ -6,7 +6,7 @@ usage() { echo "Usage: $0 [-n openfire-tag] [-h]
"; exit 0; } "; exit 0; }
PROJECT="openfire" PROJECT="openfire"
COMPOSE_FILE_COMMAND=("docker-compose") COMPOSE_FILE_COMMAND=("docker" "compose")
COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env") COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env")
COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT") COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT")

View File

@ -138,7 +138,7 @@ networks:
- subnet: 172.50.0.0/24 - subnet: 172.50.0.0/24
``` ```
Run this with `docker-compose up`. Once running navigate to `http://localhost:9093` and manually configure the Openfire server. Run this with the `start.sh`. Once running navigate to `http://localhost:9093` and manually configure the Openfire server.
The database hostname should be the name of the DB node in the compose file (so `db3` in this case). The database hostname should be the name of the DB node in the compose file (so `db3` in this case).
You should also get the database name, username, and password, from the compose file. You should also get the database name, username, and password, from the compose file.

View File

@ -6,7 +6,7 @@ usage() { echo "Usage: $0 [-n openfire-tag] [-h]
"; exit 0; } "; exit 0; }
PROJECT="openfire" PROJECT="openfire"
COMPOSE_FILE_COMMAND=("docker-compose") COMPOSE_FILE_COMMAND=("docker" "compose")
COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env") COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env")
COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT") COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT")

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
docker-compose -p openfire down docker compose -p openfire down