From ba53ba0ba1a27349982e4b76611e540069cefa6f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 10 Apr 2024 15:21:10 +0200
Subject: [PATCH] Install Docker and docker-compose from the official Ubuntu
 archives

Some threat models consider external non-distribution archives bad. As
the distribution package archives are already trusted for the
installation of the whole system, and they contain Docker and
docker-compose, use those despite their older version.

Jammy contains versions

Resolves: https://github.com/bigbluebutton/bbb-install/issues/371
---
 bbb-install.sh | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/bbb-install.sh b/bbb-install.sh
index 3cf07e2..dbfabc0 100644
--- a/bbb-install.sh
+++ b/bbb-install.sh
@@ -1377,34 +1377,10 @@ disable_nginx_site() {
 }
 
 install_docker() {
-  need_pkg apt-transport-https ca-certificates curl gnupg-agent software-properties-common openssl
+  need_pkg docker.io docker-compose
 
-  # Install Docker
-  if ! apt-key list | grep -q Docker; then
-    if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
-      curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-    fi
-  fi
-  if ! dpkg -l | grep -q docker-ce; then
-
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
-     $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-
-    apt-get update
-    need_pkg docker-ce docker-ce-cli containerd.io
-  fi
   if ! which docker; then err "Docker did not install"; fi
 
-  # Purge older docker compose if exists.
-  if dpkg -l | grep -q docker-compose; then
-    apt-get purge -y docker-compose
-  fi
-
-  if [ ! -x /usr/local/bin/docker-compose ]; then
-    curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-    chmod +x /usr/local/bin/docker-compose
-  fi
-
   # Ensuring docker is running
   if ! docker version > /dev/null ; then
     # Attempting to auto resolve by restarting docker socket and engine.