From 09366598b57a9ecd19fd34f5f844685bb6f2aabd Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Mon, 8 Jul 2019 15:13:16 -0500 Subject: [PATCH] Remove docker.io version pin Change-Id: Id45132d8476ca931042dddc4544074e26135f9fc Signed-off-by: Steve Wilkerson --- roles/deploy-docker/tasks/main.yaml | 2 +- tools/deployment/common/005-deploy-k8s.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/deploy-docker/tasks/main.yaml b/roles/deploy-docker/tasks/main.yaml index 4d4e7700b..e3aca074b 100644 --- a/roles/deploy-docker/tasks/main.yaml +++ b/roles/deploy-docker/tasks/main.yaml @@ -60,7 +60,7 @@ vars: packages: deb: - - docker.io=18.06.1-0ubuntu1.2~18.04.1 + - docker.io rpm: - docker diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh index 73ac6782b..653b2b9db 100755 --- a/tools/deployment/common/005-deploy-k8s.sh +++ b/tools/deployment/common/005-deploy-k8s.sh @@ -62,9 +62,8 @@ RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}') sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/ ${RELEASE_NAME} main" sudo -E apt-get update -# NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2 sudo -E apt-get install -y \ - docker.io=18.06.1-0ubuntu1.2~18.04.1 \ + docker.io \ socat \ jq \ util-linux \