Browse Source

Merge "Leave docker.io package"

changes/60/671960/5
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
f24e098b4d
  1. 15
      tools/deployment/airskiff/developer/000-install-packages.sh
  2. 2
      tools/deployment/airskiff/developer/005-clone-dependencies.sh

15
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 \

2
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}"

Loading…
Cancel
Save