From f8229cbc9fb2e5a30259c73b3285b757c83f90e1 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:19:19 +0200 Subject: [PATCH] engine: remove centos/rhel 7 (EOL) Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/engine/install/centos.md | 1 - content/engine/install/rhel.md | 1 - content/engine/security/rootless.md | 9 +-------- content/engine/security/userns-remap.md | 15 +++++++-------- hugo_stats.json | 11 +++++++---- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/content/engine/install/centos.md b/content/engine/install/centos.md index da4874faac..b85e77072e 100644 --- a/content/engine/install/centos.md +++ b/content/engine/install/centos.md @@ -27,7 +27,6 @@ To get started with Docker Engine on CentOS, make sure you To install Docker Engine, you need a maintained version of one of the following CentOS versions: -- CentOS 7 (EOL: [June 30, 2024](https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/#centos-linux-7-end-of-life-june-30-2024)) - CentOS 9 (stream) The `centos-extras` repository must be enabled. This repository is enabled by diff --git a/content/engine/install/rhel.md b/content/engine/install/rhel.md index 0c67bf5999..9955f7f12a 100644 --- a/content/engine/install/rhel.md +++ b/content/engine/install/rhel.md @@ -37,7 +37,6 @@ To get started with Docker Engine on RHEL, make sure you To install Docker Engine, you need a maintained version of one of the following RHEL versions: -- RHEL 7 (s390x only) (EOL: [June 30, 2024](https://www.ibm.com/blog/announcement/ibm-is-announcing-red-hat-enterprise-linux-7-is-going-end-of-support-on-30-june-2024/)) - RHEL 8 - RHEL 9 diff --git a/content/engine/security/rootless.md b/content/engine/security/rootless.md index b8a877c0bf..016316b596 100644 --- a/content/engine/security/rootless.md +++ b/content/engine/security/rootless.md @@ -127,18 +127,11 @@ testuser:231072:65536 - Known to work on openSUSE 15 and SLES 15. {{< /tab >}} -{{< tab name="CentOS 9 (stream), RHEL 8, and Fedora" >}} +{{< tab name="CentOS, RHEL, and Fedora" >}} - Installing `fuse-overlayfs` is recommended. Run `sudo dnf install -y fuse-overlayfs`. - You might need `sudo dnf install -y iptables`. {{< /tab >}} -{{< tab name="CentOS 7 and RHEL 7" >}} -- Add `user.max_user_namespaces=28633` to `/etc/sysctl.conf` (or - `/etc/sysctl.d`) and run `sudo sysctl --system`. - -- `systemctl --user` does not work by default. - Run `dockerd-rootless.sh` directly without systemd. -{{< /tab >}} {{< /tabs >}} ## Known limitations diff --git a/content/engine/security/userns-remap.md b/content/engine/security/userns-remap.md index fa2c80d04c..790aee3a5e 100644 --- a/content/engine/security/userns-remap.md +++ b/content/engine/security/userns-remap.md @@ -49,10 +49,10 @@ purpose. > **Warning** > -> Some distributions, such as RHEL and CentOS 7.3, do not -> automatically add the new group to the `/etc/subuid` and `/etc/subgid` files. -> You are responsible for editing these files and assigning non-overlapping -> ranges, in this case. This step is covered in [Prerequisites](#prerequisites). +> Some distributions do not automatically add the new group to the +> `/etc/subuid` and `/etc/subgid` files. If that's the case, you are may have +> to manually edit these files and assign non-overlapping ranges. This step is +> covered in [Prerequisites](#prerequisites). { .warning } It is very important that the ranges do not overlap, so that a process cannot gain @@ -86,9 +86,8 @@ avoid these situations. 2. The way the namespace remapping is handled on the host is using two files, `/etc/subuid` and `/etc/subgid`. These files are typically managed - automatically when you add or remove users or groups, but on a few - distributions such as RHEL and CentOS 7.3, you may need to manage these - files manually. + automatically when you add or remove users or groups, but on some + distributions, you may need to manage these files manually. Each file contains three fields: the username or ID of the user, followed by a beginning UID or GID (which is treated as UID or GID 0 within the namespace) @@ -273,4 +272,4 @@ expected privileges of the superuser within the container, the Linux kernel imposes restrictions based on internal knowledge that this is a user-namespaced process. One notable restriction is the inability to use the `mknod` command. Permission is denied for device creation within the container when run by -the `root` user. \ No newline at end of file +the `root` user. diff --git a/hugo_stats.json b/hugo_stats.json index d7cc453f38..23447f3b91 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -24,8 +24,7 @@ "BitBucket-Pipelines", "Buildkite", "CLI", - "CentOS-7-and-RHEL-7", - "CentOS-9-stream-RHEL-8-and-Fedora", + "CentOS-RHEL-and-Fedora", "Circle-CI", "Clone-with-git", "Command-Prompt", @@ -38,7 +37,9 @@ "Docker-Desktop", "Docker-Engine", "Docker-Hub", + "Docker-Scout-Dashboard", "Download", + "Editor-or-IDE", "Entra-ID", "Entra-ID-SAML-2.0", "Fedora", @@ -49,6 +50,7 @@ "Git-Bash", "Git-Bash-CLI", "GitHub-Actions", + "GitHub.com", "GitLab", "Go", "HTTP", @@ -84,7 +86,9 @@ "RHEL-9", "Raw", "React", + "Regular-install", "Remote-file", + "Rootless-mode", "Run-Ollama-in-a-container", "Run-Ollama-outside-of-a-container", "Shell", @@ -301,6 +305,7 @@ "lntd", "m-2", "m-auto", + "macOS", "max-h-[80vh]", "max-h-full", "max-w-56", @@ -379,13 +384,11 @@ "py-20", "py-4", "py-8", - "regular-install", "relative", "restricted", "right-0", "right-3", "right-8", - "rootless-mode", "rotate-45", "rounded", "rounded-[6px]",