diff --git a/.ci/test-install-docs.sh b/.ci/test-install-docs.sh index d903342ca..a493f7329 100755 --- a/.ci/test-install-docs.sh +++ b/.ci/test-install-docs.sh @@ -225,7 +225,18 @@ test_alternative_install_methods() run_tests() { + # If docker was installed by default, zap it. + $mgr -v -f remove-docker + test_distro_install_guide + + # Remove docker in preparation for the next test. + # + # This is required since docker may have been pinned (to ensure a + # particular version is installed). But when a package is pinned, you + # cannot change it (although you can remove it). + $mgr -v -f remove-docker + test_alternative_install_methods } diff --git a/install/docker/centos-docker-install.md b/install/docker/centos-docker-install.md index c2248a6e5..5f7bf0eea 100644 --- a/install/docker/centos-docker-install.md +++ b/install/docker/centos-docker-install.md @@ -5,13 +5,24 @@ > - This guide assumes you have > [already installed the Kata Containers packages](../centos-installation-guide.md). -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo yum versionlock delete docker-ce + > ``` ```bash $ sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - $ sudo yum -y install docker-ce + $ sudo yum -y install 'docker-ce-18.06.2.ce-3*' yum-plugin-versionlock + $ sudo yum versionlock docker-ce ``` For more information on installing Docker please refer to the diff --git a/install/docker/debian-docker-install.md b/install/docker/debian-docker-install.md index 26b926f90..0a8bf333f 100644 --- a/install/docker/debian-docker-install.md +++ b/install/docker/debian-docker-install.md @@ -6,16 +6,27 @@ > [already installed the Kata Containers packages](../debian-installation-guide.md). > - this guide allows for installation with `systemd` or `sysVinit` init systems -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo apt-mark unhold docker-ce + > ``` ```bash $ sudo apt-get -y install apt-transport-https ca-certificates curl gnupg2 software-properties-common $ curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add - $ sudo add-apt-repository "deb https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable" $ sudo apt-get update - $ sudo apt-get -y install docker-ce + $ sudo -E apt-get -y install --allow-downgrades docker-ce='18.06.2~ce~3-0~debian' + $ sudo apt-mark hold docker-ce ``` For more information on installing Docker please refer to the diff --git a/install/docker/fedora-docker-install.md b/install/docker/fedora-docker-install.md index 3e4228ccb..60c8af43b 100644 --- a/install/docker/fedora-docker-install.md +++ b/install/docker/fedora-docker-install.md @@ -5,14 +5,28 @@ > - This guide assumes you have > [already installed the Kata Containers packages](../fedora-installation-guide.md). -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo dnf versionlock delete docker-ce + > ``` ```bash + $ source /etc/os-release $ sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo $ sudo dnf makecache - $ sudo dnf -y install docker-ce + $ docker_pkg='docker-ce-18.06.2.ce-3*' + $ [ "$VERSION_ID" -gt 28 ] && docker_pkg=docker-ce + $ sudo dnf -y install $docker_pkg python3-dnf-plugin-versionlock + $ sudo dnf versionlock docker-ce ``` For more information on installing Docker please refer to the diff --git a/install/docker/opensuse-docker-install.md b/install/docker/opensuse-docker-install.md index 385c0a653..b40a5f8c5 100644 --- a/install/docker/opensuse-docker-install.md +++ b/install/docker/opensuse-docker-install.md @@ -5,13 +5,24 @@ > - This guide assumes you have > [already installed the Kata Containers packages](../opensuse-installation-guide.md). -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo zypper removelock docker + > ``` ```bash $ sudo zypper -n install libcgroup1 - $ sudo zypper -n install docker + $ sudo zypper -n install 'docker<18.09' + $ sudo zypper addlock docker ``` For more information on installing Docker please refer to the diff --git a/install/docker/sles-docker-install.md b/install/docker/sles-docker-install.md index 69f1870f4..604e1ea4c 100644 --- a/install/docker/sles-docker-install.md +++ b/install/docker/sles-docker-install.md @@ -5,12 +5,23 @@ > - This guide assumes you have > [already installed the Kata Containers packages](../sles-installation-guide.md). -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo zypper removelock docker + > ``` ```bash - $ sudo zypper -n install docker + $ sudo zypper -n install 'docker<18.09' + $ sudo zypper addlock docker ``` For more information on installing Docker please refer to the diff --git a/install/docker/ubuntu-docker-install.md b/install/docker/ubuntu-docker-install.md index 0b6e01a27..07ab48567 100644 --- a/install/docker/ubuntu-docker-install.md +++ b/install/docker/ubuntu-docker-install.md @@ -5,9 +5,19 @@ > - This guide assumes you have > [already installed the Kata Containers packages](../ubuntu-installation-guide.md). -1. Install the latest version of Docker with the following commands: +1. Install Docker with the following commands: - > **Note:** This step is only required if Docker is not installed on the system. + > **Notes:** + > + > - This step is only required if Docker is not installed on the system. + > - Newer versions of Docker have + > [removed devicemapper support](https://github.com/kata-containers/documentation/issues/373) + > so the commands below install the latest version which includes + > devicemapper support. + > - To remove the lock on the docker package to allow it to be updated: + > ```sh + > $ sudo apt-mark unhold docker-ce + > ``` ```bash $ sudo -E apt-get -y install apt-transport-https ca-certificates software-properties-common @@ -15,7 +25,8 @@ $ arch=$(dpkg --print-architecture) $ sudo -E add-apt-repository "deb [arch=${arch}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" $ sudo -E apt-get update - $ sudo -E apt-get -y install docker-ce + $ sudo -E apt-get -y install --allow-downgrades docker-ce='18.06.2~ce~3-0~ubuntu' + $ sudo apt-mark hold docker-ce ``` For more information on installing Docker please refer to the