openstack/devstack-plugin-container
Code Issues Proposed changes

Support installing specific version of docker

Browse Source 
Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b
This commit is contained in:
Hongbin Lu
2023-02-24 15:11:02 +00:00
parent bdc0b49ce3
commit f8e786f0d5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/docker
View File

@@ -77,7 +77,11 @@ function install_docker {
${dist_version} \ ${dist_version} \
stable" stable"
REPOS_UPDATED=False apt_get_update 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 elif is_fedora; then
if [[ "$lsb_dist" = "centos" ]]; then if [[ "$lsb_dist" = "centos" ]]; then
sudo yum-config-manager \ sudo yum-config-manager \

2
devstack/settings
View File

@@ -14,6 +14,8 @@ CRIO_ALLOW_ICMP=${CRIO_ALLOW_ICMP:-true}
CNI_CONF_DIR=${CNI_CONF_DIR:-} CNI_CONF_DIR=${CNI_CONF_DIR:-}
CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-} CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-}
UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-}
# Enable container services # Enable container services
enable_service container enable_service container