Merge pull request #271 from leonidas-o/develop

Deprecated ComposeV1, update to ComposeV2

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

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"

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?

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
 ```

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
+docker compose exec recordings bbb-record $@
+docker compose logs --tail=15 recordings

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"

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

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 \

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"

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

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

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