Leave docker.io package
Minikube is now supporting docker 18.09, so we don't need to install docker-ce. Change-Id: Iaa33e41954a0203c4ba7243ea66d08928cf68b9d
This commit is contained in:
parent
8a94b9bf58
commit
d2eef36c07
|
@ -17,23 +17,14 @@
|
||||||
|
|
||||||
set -xe
|
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
|
sudo apt-get update
|
||||||
|
|
||||||
# Purge Docker and install Docker CE
|
# NOTE(danpawlik) Docker 18.09 is supported by minikube, so we can
|
||||||
sudo systemctl unmask docker.service
|
# leave version installed by OSH scripts.
|
||||||
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 install --allow-downgrades --no-install-recommends -y \
|
sudo apt-get install --allow-downgrades --no-install-recommends -y \
|
||||||
apparmor \
|
apparmor \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
docker-ce=18.06.3~ce~3-0~ubuntu \
|
docker.io \
|
||||||
git \
|
git \
|
||||||
make \
|
make \
|
||||||
jq \
|
jq \
|
||||||
|
|
|
@ -19,7 +19,7 @@ set -xe
|
||||||
|
|
||||||
CURRENT_DIR="$(pwd)"
|
CURRENT_DIR="$(pwd)"
|
||||||
: "${INSTALL_PATH:="../"}"
|
: "${INSTALL_PATH:="../"}"
|
||||||
: "${OSH_INFRA_COMMIT:="6d0a9c21b0455e9d674d525c5e0cd0d5d53f0f85"}"
|
: "${OSH_INFRA_COMMIT:="09366598b57a9ecd19fd34f5f844685bb6f2aabd"}"
|
||||||
: "${CLONE_ARMADA:=true}"
|
: "${CLONE_ARMADA:=true}"
|
||||||
: "${CLONE_DECKHAND:=true}"
|
: "${CLONE_DECKHAND:=true}"
|
||||||
: "${CLONE_SHIPYARD:=true}"
|
: "${CLONE_SHIPYARD:=true}"
|
||||||
|
|
Loading…
Reference in New Issue