docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13412 from thaJeztah/carry_13381_s390x_changes 

[carry 13381] Updated docs for s390x for latest version
This commit is contained in:
Sebastiaan van Stijn 2021-08-27 10:10:56 +02:00 committed by GitHub
parent e490f83739 599660d47f
commit fbf817d974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/install/rhel.md
View File

@ -151,7 +151,9 @@ $ sudo yum-config-manager \
```console
$ yum list docker-ce --showduplicates | sort -r
docker-ce.s390x 3:20.10.8-3.el8 docker-ce-stable
docker-ce.s390x 3:20.10.7-3.el8 docker-ce-stable
<...>
```
The list returned depends on which repositories are enabled, and is specific

26
engine/install/sles.md
View File

@ -34,18 +34,20 @@ 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
default, you need to
[add it](https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo).
The [OpenSUSE `SELinux` repository](https://download.opensuse.org/repositories/security)
must be enabled. This repository is not added by default, and you need to enable
it for the version of SLES you are running. Run the following commands to add it:
```console
$ zypper addrepo https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo
$ sles_version="$(. /etc/os-release && echo "${VERSION_ID##*.}")"
$ 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.
@ -102,9 +104,7 @@ from the repository.
Set up the **stable** repository.
```console
$ sudo zypper \
addrepo \
{{ download-url-base }}/docker-ce.repo
$ sudo zypper addrepo {{ download-url-base }}/docker-ce.repo
```
> **Optional**: Enable the **nightly** or **test** repositories.
@ -159,16 +159,18 @@ $ 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.8-3 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:20.10.7-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`.
the package name (`docker-ce`) plus the version string (fourth column),
separated by a hyphen (`-`). For example, `docker-ce-3:20.10.8`.
```console
$ sudo zypper install docker-ce-<VERSION_STRING> docker-ce-cli-<VERSION_STRING> containerd.io

10
engine/security/rootless.md
View File

@ -54,7 +54,7 @@ testuser:231072:65536
<li class="active"><a data-toggle="tab" data-target="#hint-ubuntu">Ubuntu</a></li>
<li><a data-toggle="tab" data-target="#hint-debian">Debian GNU/Linux</a></li>
<li><a data-toggle="tab" data-target="#hint-arch">Arch Linux</a></li>
<li><a data-toggle="tab" data-target="#hint-opensuse">openSUSE</a></li>
<li><a data-toggle="tab" data-target="#hint-opensuse-sles">openSUSE and SLES</a></li>
<li><a data-toggle="tab" data-target="#hint-centos8-rhel8-fedora">CentOS 8, RHEL 8 and Fedora</a></li>
<li><a data-toggle="tab" data-target="#hint-centos7-rhel7">CentOS 7 and RHEL 7</a></li>
</ul>
@ -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, and 21.04.
</div>
<div id="hint-debian" class="tab-pane fade in" markdown="1">
- 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`
</div>
<div id="hint-opensuse" class="tab-pane fade in" markdown="1">
<div id="hint-opensuse-sles" class="tab-pane fade in" markdown="1">
- 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.
</div>
<div id="hint-centos8-rhel8-fedora" class="tab-pane fade in" markdown="1">
- 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.
</div>
<div id="hint-centos7-rhel7" class="tab-pane fade in" markdown="1">
- Add `user.max_user_namespaces=28633` to `/etc/sysctl.conf` (or

2
storage/storagedriver/btrfs-driver.md
View File

@ -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