From b42b808ddb2efa0506fcebc417f16772843839f2 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Thu, 22 Apr 2021 15:47:32 -0500 Subject: [PATCH] Remove duplicate docker install This was causing gate failures after we started using the airshipctl docker-install script [0]. [0]: https://review.opendev.org/c/airship/sip/+/785248 Change-Id: Ibcd5ae8fb7ffc2b5d0d968945e67d7e0641a9f09 --- README.md | 4 ++++ tools/deployment/install-k8s.sh | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a0b6a39..d6b1b67 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,10 @@ USE_PROXY=true - `10.96.0.0/12` is the Kubernetes service IP range - `192.168.0.0/16` is the Kubernetes pod IP range +#### Install Docker + +See [https://docs.docker.com/engine/install/ubuntu/][]. + #### Deploy kubernetes using minikube and create k8s cluster ``` diff --git a/tools/deployment/install-k8s.sh b/tools/deployment/install-k8s.sh index 12e30d1..54a3fe7 100755 --- a/tools/deployment/install-k8s.sh +++ b/tools/deployment/install-k8s.sh @@ -11,21 +11,10 @@ set -ex export DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND=noninteractive -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - -sudo apt-key fingerprint 0EBFCD88 - -sudo add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" sudo -E apt-get update sudo -E apt-get install -y \ - docker-ce \ - docker-ce-cli \ - containerd.io \ socat \ jq \ util-linux \