From 8c1ae1e48b6bf6d255baed7e3b07a855381b6ce7 Mon Sep 17 00:00:00 2001 From: Leonid Orsulic Date: Sun, 7 May 2023 11:07:09 +0200 Subject: [PATCH] update commands to docker compose V2 --- README.md | 10 +++++----- docker-compose.tmpl.yml | 2 +- docs/development.md | 10 +++++----- docs/upgrading.md | 2 +- scripts/bbb-record | 4 ++-- scripts/fs_cli | 2 +- scripts/greenlight-migrate-v2-v3 | 2 +- scripts/publish | 4 ++-- scripts/setup | 2 +- scripts/upgrade | 4 ++-- scripts/upgrade-and-build | 6 +++--- tags.env | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index b0e3d9a..4436c4c 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,15 @@ Version: 2.6.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigblue - bbb-lti ## Install -1. Install docker-ce & docker-compose +1. Install docker-ce & docker-compose-plugin 1. follow instructions * Debian: https://docs.docker.com/engine/install/debian/ * CentOS: https://docs.docker.com/engine/install/centos/ * Fedora: https://docs.docker.com/engine/install/fedora/ * Ubuntu: https://docs.docker.com/engine/install/ubuntu/ 2. Ensure docker works with `$ docker run hello-world` - 3. Install docker-compose: https://docs.docker.com/compose/install/ - 4. Ensure docker-compose works and that you use a version ≥ 1.28 : `$ docker-compose --version` + 3. Install docker compose V2: https://docs.docker.com/compose/install/ + 4. Ensure docker compose works and that you use a version ≥ 1.28 : `$ docker compose --version` 2. Clone this repository ```sh $ git clone --recurse-submodules https://github.com/bigbluebutton/docker.git bbb-docker @@ -46,11 +46,11 @@ Version: 2.6.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigblue ``` 5. Start containers: ```bash - $ docker-compose up -d + $ docker compose up -d ``` 6. If you use greenlight, you can create an admin account with: ```bash - $ docker-compose exec greenlight bundle exec rake admin:create + $ docker compose exec greenlight bundle exec rake admin:create ``` ## Further How-To's diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index 0d56003..94e26e4 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -135,7 +135,7 @@ services: - vol-freeswitch:/var/freeswitch/meetings network_mode: host logging: - # reduce logs to a minimum, so `docker-compose logs -f` still works + # reduce logs to a minimum, so `docker compose logs -f` still works driver: "local" options: max-size: "10k" diff --git a/docs/development.md b/docs/development.md index f499f00..a8d85ee 100644 --- a/docs/development.md +++ b/docs/development.md @@ -42,11 +42,11 @@ RAILS_SECRET=SuperRailsSecret_SuperRailsSecret - regenerate `docker-compose.yml` \ `$ ./scripts/generate-compose` - build the images \ - `$ docker-compose build` + `$ docker compose build` - you can than start it with \ - `$ docker-compose up -d` + `$ docker compose up -d` - view the logs with \ - `$ docker-compose logs -f` + `$ docker compose logs -f` - and access the API via \ https://mconf.github.io/api-mate/#server=https://10.7.7.1/bigbluebutton/api&sharedSecret=SuperSecret * At some point your browser will warn you about an invalid certificate, but you can press _"Accept the Risk and Continue" / "Proceed to 10.7.7.1 (unsafe)"_ @@ -60,9 +60,9 @@ RAILS_SECRET=SuperRailsSecret_SuperRailsSecret - recreate `docker-compose.yml` \ `$ ./scripts/generate-compose` * rebuild the image(s): \ - `$ docker-compose build [containername]` + `$ docker compose build [containername]` * restart changes image(s): \ - `$ docker-compose up -d` + `$ docker compose up -d` ## How to do create a new update for a newer BBB release? diff --git a/docs/upgrading.md b/docs/upgrading.md index 92bd003..a62a241 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -23,5 +23,5 @@ docker exec -t docker_postgres_1 pg_dumpall -c -U postgres > /root/greenlight_`d ./scripts/upgrade # restart updated services -docker-compose up -d +docker compose up -d ``` diff --git a/scripts/bbb-record b/scripts/bbb-record index 3814956..52e9277 100755 --- a/scripts/bbb-record +++ b/scripts/bbb-record @@ -16,5 +16,5 @@ if [ ! "$ENABLE_RECORDING" == true ]; then exit 1 fi -docker-compose exec recordings bbb-record $@ -docker-compose logs --tail=15 recordings \ No newline at end of file +docker compose exec recordings bbb-record $@ +docker compose logs --tail=15 recordings \ No newline at end of file diff --git a/scripts/fs_cli b/scripts/fs_cli index fd1ec54..0624ddf 100755 --- a/scripts/fs_cli +++ b/scripts/fs_cli @@ -9,4 +9,4 @@ then export $(cat .env | sed 's/#.*//g' | grep "FSESL_PASSWORD" | xargs) fi -docker-compose exec freeswitch /opt/freeswitch/bin/fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD" +docker compose exec freeswitch /opt/freeswitch/bin/fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD" diff --git a/scripts/greenlight-migrate-v2-v3 b/scripts/greenlight-migrate-v2-v3 index a341b19..e6ad3d1 100755 --- a/scripts/greenlight-migrate-v2-v3 +++ b/scripts/greenlight-migrate-v2-v3 @@ -8,7 +8,7 @@ then export $(cat .env | sed 's/#.*//g' | grep -E "RAILS_SECRET|POSTGRESQL_SECRET" | xargs) fi -COMPOSE_PREFIX=$(docker-compose ps | grep postgres | awk '{print $1}' | sed 's/-postgres-1//') +COMPOSE_PREFIX=$(docker compose ps | grep postgres | awk '{print $1}' | sed 's/-postgres-1//') docker kill -s SIGKILL greenlight-v2-tmp 2>/dev/null sleep 1 diff --git a/scripts/publish b/scripts/publish index 41b475f..540ae8f 100755 --- a/scripts/publish +++ b/scripts/publish @@ -31,11 +31,11 @@ fi docker build -t alangecker/bbb-docker-base-java:latest mod/base-java # buld and push other images -docker-compose build +docker compose build # push images docker push alangecker/bbb-docker-base-java:latest -docker-compose push \ +docker compose push \ html5-backend-1 \ bbb-web \ freeswitch \ diff --git a/scripts/setup b/scripts/setup index 3f4ecdf..1667c0d 100755 --- a/scripts/setup +++ b/scripts/setup @@ -208,4 +208,4 @@ echo "make sure to recreate the docker-compose.yml after each change" echo " $ ./scripts/generate-compose" echo "" echo "to start bigbluebutton run" -echo " $ docker-compose up -d" +echo " $ docker compose up -d" diff --git a/scripts/upgrade b/scripts/upgrade index 8ac1c35..4d403b5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ else echo "" echo "# pull newest images" - docker-compose pull --ignore-pull-failures + docker compose pull --ignore-pull-failures COMMIT_HASH=$(git rev-parse --short HEAD) @@ -33,6 +33,6 @@ else echo "we are on $COMMIT_HASH ($BRANCH_NAME)" echo "" echo "use following command for restarting bbb:" - echo " $ docker-compose up -d --no-build" + echo " $ docker compose up -d --no-build" echo "-------------------------------------" fi \ No newline at end of file diff --git a/scripts/upgrade-and-build b/scripts/upgrade-and-build index 1decee6..9543c30 100755 --- a/scripts/upgrade-and-build +++ b/scripts/upgrade-and-build @@ -25,14 +25,14 @@ else echo "" echo "# pull newest images" - docker-compose pull --ignore-pull-failures + docker compose pull --ignore-pull-failures echo "" echo "# rebuild images" docker build -t alangecker/bbb-docker-base-java:latest mod/base-java # rebuild everything which got modified - docker-compose build + docker compose build COMMIT_HASH=$(git rev-parse --short HEAD) BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) @@ -43,6 +43,6 @@ else echo "we are on $COMMIT_HASH ($BRANCH_NAME)" echo "" echo "use following command for restarting bbb:" - echo " $ docker-compose up -d" + echo " $ docker compose up -d" echo "-------------------------------------" fi \ No newline at end of file diff --git a/tags.env b/tags.env index 3563985..ee7aeaf 100644 --- a/tags.env +++ b/tags.env @@ -1,6 +1,6 @@ # after changing a tag always run following commands to apply # - ./scripts/generate-compose -# - docker-compose build +# - docker compose build # https://gitlab.senfcall.de/senfcall-public/docker-bbb-build