From d2eef36c078ffebba28a25f298e1ec2f281b5e1b Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <pawlik.dan@gmail.com>
Date: Wed, 24 Jul 2019 09:13:22 +0000
Subject: [PATCH] Leave docker.io package

Minikube is now supporting docker 18.09, so we don't need to install
docker-ce.
Change-Id: Iaa33e41954a0203c4ba7243ea66d08928cf68b9d
---
 .../airskiff/developer/000-install-packages.sh    | 15 +++------------
 .../airskiff/developer/005-clone-dependencies.sh  |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tools/deployment/airskiff/developer/000-install-packages.sh b/tools/deployment/airskiff/developer/000-install-packages.sh
index 83ff3dbf4..c51775bb5 100755
--- a/tools/deployment/airskiff/developer/000-install-packages.sh
+++ b/tools/deployment/airskiff/developer/000-install-packages.sh
@@ -17,23 +17,14 @@
 
 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"
 sudo apt-get update
 
-# 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.
+# NOTE(danpawlik) Docker 18.09 is supported by minikube, so we can
+# leave version installed by OSH scripts.
 sudo apt-get install --allow-downgrades --no-install-recommends -y \
         apparmor \
         ca-certificates \
-        docker-ce=18.06.3~ce~3-0~ubuntu \
+        docker.io \
         git \
         make \
         jq \
diff --git a/tools/deployment/airskiff/developer/005-clone-dependencies.sh b/tools/deployment/airskiff/developer/005-clone-dependencies.sh
index 2a068f0c2..26130baf8 100755
--- a/tools/deployment/airskiff/developer/005-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/005-clone-dependencies.sh
@@ -19,7 +19,7 @@ set -xe
 
 CURRENT_DIR="$(pwd)"
 : "${INSTALL_PATH:="../"}"
-: "${OSH_INFRA_COMMIT:="6d0a9c21b0455e9d674d525c5e0cd0d5d53f0f85"}"
+: "${OSH_INFRA_COMMIT:="09366598b57a9ecd19fd34f5f844685bb6f2aabd"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"