From 312bdd489b744e9bd36d97cb0a408f7dc6a00502 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 19 Nov 2020 16:01:20 -0800
Subject: [PATCH] make docker installer more extensible

---
 hack/jenkins/common.sh                          |  6 ++++--
 hack/jenkins/installers/check_install_docker.sh | 13 +++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
index 774d50c86..0f8cec2a2 100755
--- a/hack/jenkins/common.sh
+++ b/hack/jenkins/common.sh
@@ -30,8 +30,10 @@ export GOPATH="$HOME/go"
 export KUBECONFIG="${TEST_HOME}/kubeconfig"
 export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin"
 
-# install lsof for finding none driver procs, psmisc to use pstree in cronjobs
-sudo apt-get -y install lsof psmisc
+if [ "$(uname)" != "Darwin" ]; then
+  # install lsof for finding none driver procs, psmisc to use pstree in cronjobs
+  sudo apt-get -y install lsof psmisc
+fi
 
 # installing golang so we could do go get for gopogh
 sudo ./installers/check_install_golang.sh "1.15.2" "/usr/local" || true
diff --git a/hack/jenkins/installers/check_install_docker.sh b/hack/jenkins/installers/check_install_docker.sh
index 83e9875e7..cf2e5e9de 100755
--- a/hack/jenkins/installers/check_install_docker.sh
+++ b/hack/jenkins/installers/check_install_docker.sh
@@ -18,17 +18,14 @@ set -eux -o pipefail
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   echo "detected darwin, exiting"
-  return
+  exit 0
 fi
 
 echo "Installing latest docker"
-sudo apt-get -y update
-sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common  
-curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian `lsb_release -cs` stable"
-sudo apt-get -y update
-sudo apt-get -y install docker-ce docker-ce-cli containerd.io
-sudo usermod -aG docker jenkins
+curl -fsSL https://get.docker.com -o get-docker.sh
+sudo sh get-docker.sh
+rm get-docker.sh
+sudo adduser jenkins docker || true
 
 echo "Installing latest kubectl"
 curl -LO "https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl"
-- 
GitLab