From b242fdab1da1ece50d2a894def88f9e699aa9d9d Mon Sep 17 00:00:00 2001 From: Jan Schulte Date: Fri, 28 Aug 2020 10:45:57 -0400 Subject: [PATCH 1/3] Update to latest Docker version Otherwise users can't install worker on Ubuntu 20.04 --- installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index e5578b4..3403574 100644 --- a/installer.sh +++ b/installer.sh @@ -80,7 +80,7 @@ while [ $# -gt 0 ]; do done if [[ -z $DOCKER_VERSION ]]; then - export DOCKER_VERSION="18.06.1~ce~3-0~ubuntu" + export DOCKER_VERSION="5:19.03.12~3-0~ubuntu" else export DOCKER_VERSION fi From a8ab82a70fad8fa3a27dd68beba0876b78f96934 Mon Sep 17 00:00:00 2001 From: Jan Schulte Date: Fri, 28 Aug 2020 10:51:31 -0400 Subject: [PATCH 2/3] Fix docker version string We need the distribution name in there --- installer.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index 3403574..138fc38 100644 --- a/installer.sh +++ b/installer.sh @@ -80,7 +80,8 @@ while [ $# -gt 0 ]; do done if [[ -z $DOCKER_VERSION ]]; then - export DOCKER_VERSION="5:19.03.12~3-0~ubuntu" + DOCKER_VERSION_STR="5:19.03.12~3-0~ubuntu-$(lsb_release -cs)" + export DOCKER_VERSION=$DOCKER_VERSION_STR else export DOCKER_VERSION fi From 12ffffc5a3e713b7b173d716abbb4e5ed6d5f6da Mon Sep 17 00:00:00 2001 From: Jan Schulte Date: Fri, 28 Aug 2020 11:04:33 -0400 Subject: [PATCH 3/3] Fix shellcheck linting errors --- installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index 138fc38..d5f7f43 100644 --- a/installer.sh +++ b/installer.sh @@ -198,7 +198,7 @@ install_docker() { apt-get update if ! docker version &>/dev/null; then - apt-get install -y docker-ce=$DOCKER_VERSION + apt-get install -y docker-ce="$DOCKER_VERSION" fi }