From b781519e187ab95cd4be20de3911cf382da8f166 Mon Sep 17 00:00:00 2001 From: anujajakhade Date: Tue, 17 Aug 2021 10:18:59 +0530 Subject: [PATCH] Updated docs for s390x for latest version Signed-off-by: Anuja Jakhade --- engine/install/rhel.md | 1 + engine/install/sles.md | 21 ++++++++++++--------- engine/security/rootless.md | 10 +++++----- storage/storagedriver/btrfs-driver.md | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/engine/install/rhel.md b/engine/install/rhel.md index 9392ccaa47..c51ef61e46 100644 --- a/engine/install/rhel.md +++ b/engine/install/rhel.md @@ -152,6 +152,7 @@ $ sudo yum-config-manager \ $ yum list docker-ce --showduplicates | sort -r docker-ce.s390x 3:20.10.7-3.el8 docker-ce-stable + docker-ce.s390x 3:20.10.8-3.el8 docker-ce-stable ``` The list returned depends on which repositories are enabled, and is specific diff --git a/engine/install/sles.md b/engine/install/sles.md index 6ae2ac217c..210f3e25c8 100644 --- a/engine/install/sles.md +++ b/engine/install/sles.md @@ -34,18 +34,21 @@ To get started with Docker Engine on SLES, make sure you ### OS requirements -To install Docker Engine, you need a maintained version of SLES 15-SP2 on s390x (IBM Z). +To install Docker Engine, you need a maintained version of SLES 15-SP2 or SLES 15-SP3 on s390x (IBM Z). Archived versions aren't supported or tested. The [`SCC SUSE`](https://scc.suse.com/packages?name=SUSE%20Linux%20Enterprise%20Server&version=15.2&arch=s390x) repositories must be enabled. -The `SELinux (SLE_15_SP2)`repository must be enabled. This repository is not added by +The `SELinux` repository must be enabled. This repository is not added by default, you need to -[add it](https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo). +[add it](https://download.opensuse.org/repositories/security). ```console -$ zypper addrepo https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo +$ sudo zypper install -y lsb-release +$ sles_version=$(lsb_release -r | rev | cut -c1) +$ opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP$sles_version/security:SELinux.repo" +$ sudo zypper addrepo $opensuse_repo ``` The `overlay2` storage driver is recommended. @@ -159,16 +162,16 @@ $ sudo zypper \ results by version number, highest to lowest, and is truncated: ```console - $ sudo zypper se docker-ce --match-exact | sort -r + $ sudo zypper search -s --match-exact docker-ce | sort -r + + v | docker-ce | package | 3:20.10.7-3 | s390x | Docker CE Stable - s390x + v | docker-ce | package | 3:20.10.8-3 | s390x | Docker CE Stable - s390x ``` The list returned depends on which repositories are enabled, and is specific to your version of SLES. - b. Install a specific version by its fully qualified package name, which is - the package name (`docker-ce`) plus the version string (2nd column) - starting at the first colon (`:`), up to the first hyphen, separated by - a hyphen (`-`). For example, `docker-ce-18.09.1`. + b. Install a specific version using the version string from the fourth column, For example, `docker-ce-3:20.10.7`. ```console $ sudo zypper install docker-ce- docker-ce-cli- containerd.io diff --git a/engine/security/rootless.md b/engine/security/rootless.md index ff5ccb100a..ea5dfd014f 100644 --- a/engine/security/rootless.md +++ b/engine/security/rootless.md @@ -54,7 +54,7 @@ testuser:231072:65536
  • Ubuntu
  • Debian GNU/Linux
  • Arch Linux
    • -
  • openSUSE
    • +
  • openSUSE and SLES
  • CentOS 8, RHEL 8 and Fedora
  • CentOS 7 and RHEL 7
    • @@ -66,7 +66,7 @@ testuser:231072:65536 - `overlay2` storage driver is enabled by default ([Ubuntu-specific kernel patch](https://kernel.ubuntu.com/git/ubuntu/ubuntu-bionic.git/commit/fs/overlayfs?id=3b7da90f28fe1ed4b79ef2d994c81efbc58f1144)). -- Known to work on Ubuntu 16.04, 18.04, and 20.04. +- Known to work on Ubuntu 18.04, 20.04, 20.10 and 21.04.
    - Add `kernel.unprivileged_userns_clone=1` to `/etc/sysctl.conf` (or @@ -92,13 +92,13 @@ testuser:231072:65536 - Add `kernel.unprivileged_userns_clone=1` to `/etc/sysctl.conf` (or `/etc/sysctl.d`) and run `sudo sysctl --system`
    -
    +
    - Installing `fuse-overlayfs` is recommended. Run `sudo zypper install -y fuse-overlayfs`. - `sudo modprobe ip_tables iptable_mangle iptable_nat iptable_filter` is required. This might be required on other distros as well depending on the configuration. -- Known to work on openSUSE 15. +- Known to work on openSUSE 15 and SLES 15.
    - Installing `fuse-overlayfs` is recommended. Run `sudo dnf install -y fuse-overlayfs`. @@ -109,7 +109,7 @@ testuser:231072:65536 A workaround for this is to `sudo dnf install -y policycoreutils-python-utils && sudo semanage permissive -a iptables_t`. This issue is tracked in [moby/moby#41230](https://github.com/moby/moby/issues/41230). -- Known to work on CentOS 8 and Fedora 33. +- Known to work on CentOS 8, RHEL 8, and Fedora 33.
    - Add `user.max_user_namespaces=28633` to `/etc/sysctl.conf` (or diff --git a/storage/storagedriver/btrfs-driver.md b/storage/storagedriver/btrfs-driver.md index 397c3706e2..77820d7fdc 100644 --- a/storage/storagedriver/btrfs-driver.md +++ b/storage/storagedriver/btrfs-driver.md @@ -18,7 +18,7 @@ easily combine multiple physical block devices into a single Btrfs filesystem. This article refers to Docker's Btrfs storage driver as `btrfs` and the overall Btrfs Filesystem as Btrfs. -> **Note**: The `btrfs` storage driver is only supported on Docker Engine - Community on Ubuntu or Debian. +> **Note**: The `btrfs` storage driver is only supported on Docker Engine - Community on SLES, Ubuntu or Debian. ## Prerequisites