From f8e786f0d5b885f003185aba6ad7e81ae3ab6dfa Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Fri, 24 Feb 2023 15:11:02 +0000 Subject: [PATCH] Support installing specific version of docker Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b --- devstack/lib/docker | 6 +++++- devstack/settings | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/devstack/lib/docker b/devstack/lib/docker index 08e3746..0950490 100644 --- a/devstack/lib/docker +++ b/devstack/lib/docker @@ -77,7 +77,11 @@ function install_docker { ${dist_version} \ stable" REPOS_UPDATED=False apt_get_update - apt_get install docker-ce + if [ -n "${UBUNTU_DOCKER_VERSION}" ]; then + apt_get install docker-ce=$UBUNTU_DOCKER_VERSION + else + apt_get install docker-ce + fi elif is_fedora; then if [[ "$lsb_dist" = "centos" ]]; then sudo yum-config-manager \ diff --git a/devstack/settings b/devstack/settings index c444672..59f3469 100644 --- a/devstack/settings +++ b/devstack/settings @@ -14,6 +14,8 @@ CRIO_ALLOW_ICMP=${CRIO_ALLOW_ICMP:-true} CNI_CONF_DIR=${CNI_CONF_DIR:-} CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-} +UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-} + # Enable container services enable_service container