Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker support for s390x #21798

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update docker support for s390x #21798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/includes/install-script.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Executing docker install script, commit: 7cae5f8b0decc17d6571f9f52eb840fbc13b273

You have now successfully installed and started Docker Engine. The `docker`
service starts automatically on Debian based distributions. On `RPM` based
distributions, such as CentOS, Fedora, RHEL or SLES, you need to start it
distributions, such as CentOS, Fedora or RHEL, you need to start it
manually using the appropriate `systemctl` or `service` command. As the message
indicates, non-root users can't run Docker commands by default.

Expand Down
3 changes: 1 addition & 2 deletions content/manuals/compose/install/linux.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ To install the Docker Compose plugin on Linux, you can either:
[Debian](/manuals/engine/install/debian.md#install-using-the-repository) |
[Raspberry Pi OS](/manuals/engine/install/raspberry-pi-os.md#install-using-the-repository) |
[Fedora](/manuals/engine/install/fedora.md#set-up-the-repository) |
[RHEL](/manuals/engine/install/rhel.md#set-up-the-repository) |
[SLES](/manuals/engine/install/sles.md#set-up-the-repository).
[RHEL](/manuals/engine/install/rhel.md#set-up-the-repository).

2. Update the package index, and install the latest version of Docker Compose:

Expand Down
3 changes: 1 addition & 2 deletions content/manuals/engine/install/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ see: [Overview of Docker Desktop](/manuals/desktop/_index.md).
| [Debian](debian.md) | ✅ | ✅ | ✅ | ✅ | |
| [Fedora](fedora.md) | ✅ | ✅ | | ✅ | |
| [Raspberry Pi OS (32-bit)](raspberry-pi-os.md) | | | ✅ | | |
| [RHEL](rhel.md) | ✅ | ✅ | | | ✅ |
| [SLES](sles.md) | | | | | ✅ |
| [RHEL](rhel.md) | ✅ | ✅ | | | |
| [Ubuntu](ubuntu.md) | ✅ | ✅ | ✅ | ✅ | ✅ |
| [Binaries](binaries.md) | ✅ | ✅ | ✅ | | |

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/install/rhel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ download a new file each time you want to upgrade Docker Engine.

2. Select your RHEL version in the list.

3. Select the applicable architecture (`x86_64`, `aarch64`, or `s390x`), and
3. Select the applicable architecture (`x86_64` or `aarch64`), and
then go to `stable/Packages/`.

4. Download the following `rpm` files for the Docker Engine, CLI, containerd,
Expand Down
267 changes: 0 additions & 267 deletions content/manuals/engine/install/sles.md
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions content/manuals/engine/security/rootless.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ testuser:231072:65536
- Add `kernel.unprivileged_userns_clone=1` to `/etc/sysctl.conf` (or
`/etc/sysctl.d`) and run `sudo sysctl --system`
{{< /tab >}}
{{< tab name="openSUSE and SLES" >}}
- For openSUSE 15 and SLES 15, Installing `fuse-overlayfs` is recommended. Run `sudo zypper install -y fuse-overlayfs`.
{{< tab name="openSUSE" >}}
- For openSUSE 15, Installing `fuse-overlayfs` is recommended. Run `sudo zypper install -y fuse-overlayfs`.
This step is not required on openSUSE Tumbleweed.

- `sudo modprobe ip_tables iptable_mangle iptable_nat iptable_filter` is required.
This might be required on other distributions as well depending on the configuration.

- Known to work on openSUSE 15 and SLES 15.
- Known to work on openSUSE 15.
{{< /tab >}}
{{< tab name="CentOS, RHEL, and Fedora" >}}
- For RHEL 8 and similar distributions, installing `fuse-overlayfs` is recommended. Run `sudo dnf install -y fuse-overlayfs`.
Expand Down
3 changes: 1 addition & 2 deletions content/manuals/engine/storage/drivers/btrfs-driver.md
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The third bullet in the prerequisites below this still talks about SLES. I guess we can remove the last sentence.

docs/content/manuals/engine/storage/drivers/btrfs-driver.md

Lines 36 to 41 in c8f9788

- `btrfs` requires a dedicated block storage device such as a physical disk. This
block device must be formatted for Btrfs and mounted into `/var/lib/docker/`.
The configuration instructions below walk you through this procedure. By
default, the SLES `/` filesystem is formatted with Btrfs, so for SLES, you do
not need to use a separate block device, but you can choose to do so for
performance reasons.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was present even before the doc was updated for s390x support. Hence, kept the same. But yes, we can remove it.

Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

> [!NOTE]
>
> The `btrfs` storage driver is only supported with Docker Engine CE on SLES,
> Ubuntu, and Debian systems.
> The `btrfs` storage driver is only supported with Docker Engine CE on Ubuntu and Debian systems.

Check warning on line 23 in content/manuals/engine/storage/drivers/btrfs-driver.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Docker.Acronyms] 'CE' has no definition.

Raw Output:
{"message": "[Docker.Acronyms] 'CE' has no definition.", "location": {"path": "content/manuals/engine/storage/drivers/btrfs-driver.md", "range": {"start": {"line": 23, "column": 67}}}, "severity": "WARNING"}

Check warning on line 23 in content/manuals/engine/storage/drivers/btrfs-driver.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Docker.Acronyms] 'CE' has no definition.

Raw Output:
{"message": "[Docker.Acronyms] 'CE' has no definition.", "location": {"path": "content/manuals/engine/storage/drivers/btrfs-driver.md", "range": {"start": {"line": 23, "column": 67}}}, "severity": "WARNING"}

## Prerequisites

Expand Down
4 changes: 2 additions & 2 deletions content/manuals/engine/storage/drivers/device-mapper-driver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ a filesystem at the operating system (OS) level.
## Prerequisites

- `devicemapper` is supported on Docker Engine - Community running on CentOS, Fedora,
SLES 15, Ubuntu, Debian, or RHEL.
Ubuntu, Debian, or RHEL.
- `devicemapper` requires the `lvm2` and `device-mapper-persistent-data` packages
to be installed.
- Changing the storage driver makes any containers you have already
Expand Down Expand Up @@ -223,7 +223,7 @@ assumes that the Docker daemon is in the `stopped` state.
- **RHEL / CentOS**: `device-mapper-persistent-data`, `lvm2`, and all
dependencies

- **Ubuntu / Debian / SLES 15**: `thin-provisioning-tools`, `lvm2`, and all
- **Ubuntu / Debian**: `thin-provisioning-tools`, `lvm2`, and all
dependencies

4. Create a physical volume on your block device from step 1, using the
Expand Down
1 change: 0 additions & 1 deletion content/manuals/engine/storage/drivers/select-storage-driver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ distribution:
| Debian | `overlay2` | `vfs` |
| CentOS | `overlay2` | `zfs`, `vfs` |
| Fedora | `overlay2` | `zfs`, `vfs` |
| SLES 15 | `overlay2` | `vfs` |
| RHEL | `overlay2` | `vfs` |

When in doubt, the best all-around configuration is to use a modern Linux
Expand Down