From c35339eb9ea2e26e10bc84303a02fbc5f1aa4025 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Fri, 7 Dec 2018 17:02:14 +0000 Subject: [PATCH] airskiff: Use Docker CE 18.06 for Minikube Minikube is not yet compatible with Docker CE 18.09. This commit changes the Docker version to 18.06 for compatibility with Minikube. Change-Id: Ifb1fb0e5b0755d7340ce4f8a554e270dd5a2e6b5 --- .../developer/000-install-packages.sh | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/deployment/airskiff/developer/000-install-packages.sh b/tools/deployment/airskiff/developer/000-install-packages.sh index 72ee2f48e..8bd228bc0 100755 --- a/tools/deployment/airskiff/developer/000-install-packages.sh +++ b/tools/deployment/airskiff/developer/000-install-packages.sh @@ -17,10 +17,23 @@ set -xe +# Docker CE Repository +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo apt-add-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" + +# Purge Docker and install Docker CE +sudo systemctl unmask docker.service +sudo apt-get remove --no-install-recommends -y docker docker-engine docker.io + +# TODO(drewwalters96): Update to Docker 18.09 when supported by Minikube. sudo apt-get update -sudo apt-get install --no-install-recommends -y \ +sudo apt-get install --allow-downgrades --no-install-recommends -y \ apparmor \ ca-certificates \ + docker-ce=18.06.1~ce~3-0~ubuntu \ git \ make \ jq \ @@ -32,18 +45,6 @@ sudo apt-get install --no-install-recommends -y \ ca-certificates \ software-properties-common -# Purge Docker and install Docker CE -sudo systemctl unmask docker.service -sudo apt-get remove --no-install-recommends -y docker docker-engine docker.io -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo apt-add-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" - -sudo apt-get update -sudo apt-get install --no-install-recommends -y docker-ce - # Enable apparmor sudo systemctl enable apparmor sudo systemctl start apparmor