From 1c40a3c4312351aae874ebb914f5f7a880943252 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Wed, 14 Dec 2022 08:21:35 -0300 Subject: [PATCH 1/3] Fix error on checking last line of ~/.ssh/config --- create_bbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_bbb.sh b/create_bbb.sh index db2d05f..34c77bf 100755 --- a/create_bbb.sh +++ b/create_bbb.sh @@ -258,7 +258,7 @@ ssh-keyscan -H "$DOCKERIP" >> ~/.ssh/known_hosts ssh-keyscan -H "$HOSTNAME" >> ~/.ssh/known_hosts # ssh-keyscan -H [hostname],[ip_address] >> ~/.ssh/known_hosts -if [ ! -z $(tail -1 ~/.ssh/config) ] ; then +if [ ! -z "$(tail -1 ~/.ssh/config)" ] ; then echo "" >> ~/.ssh/config fi From dd9b521a067160f621c6adf678d9800b4f7e5468 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Wed, 14 Dec 2022 17:32:03 -0300 Subject: [PATCH 2/3] Add validation of Docker version --- create_bbb.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/create_bbb.sh b/create_bbb.sh index 34c77bf..cd4b7de 100755 --- a/create_bbb.sh +++ b/create_bbb.sh @@ -1,4 +1,19 @@ #!/bin/bash + +if ! command -v docker &> /dev/null +then + echo "Docker not found! Required Docker 20 or greater" + exit +fi + +DOCKER_VERSION=$(docker version -f "{{.Server.Version}}") +DOCKER_VERSION_MAJOR=$(echo "$DOCKER_VERSION"| cut -d'.' -f 1) + +if [ ! "${DOCKER_VERSION_MAJOR}" -ge 20 ] ; then + echo "Invalid Docker version! Required Docker 20 or greater" + exit +fi + NAME= DOMAIN=test IP=172.17.0.2 From a5c098fa472fdd9385d89e96e16b37d9e5aa3e46 Mon Sep 17 00:00:00 2001 From: Gustavo Trott Date: Wed, 14 Dec 2022 17:32:20 -0300 Subject: [PATCH 3/3] Add instructions to run on Ubuntu 22 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0135715..24bc401 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ sudo usermod -aG docker `whoami` sudo reboot ``` +- **For Ubuntu 22.04 users:** In our tests, `containerd` had to be downgraded to version 1.6.6 in order to have all features working properly. `sudo apt install containerd.io=1.6.6-1`. + ## Container setup 1. Save (right click, save as) the creation script in home directory (`~`): [create_bbb.sh](create_bbb.sh?raw=1)