From 04d1de1324a337f89f10c40ff9a6ad0d0e26818b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Oct 2016 21:13:26 -0700 Subject: [PATCH] Remove Fedora 22 from RPM build as it is EOL Fedora 22 reached end of life on July 19th, and will no longer receive updates; https://fedoramagazine.org/fedora-22-end-of-life-2016-july/ With the recent release of Fedora 24, Fedora 22 will officially enter End Of Life (EOL) status on July 19th, 2016. After July 19th, all packages in the Fedora 22 repositories will no longer receive security, bugfix, or enhancement updates, and no new packages will be added to the Fedora 22 collection. Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended for all users still running Fedora 22. Signed-off-by: Sebastiaan van Stijn Upstream-commit: ff405a1d2b9cb7ccbd315e882b6bd7560eb4159c Component: engine --- .../builder/rpm/amd64/fedora-22/Dockerfile | 18 ------------------ .../docs/reference/commandline/dockerd.md | 5 ----- 2 files changed, 23 deletions(-) delete mode 100644 components/engine/contrib/builder/rpm/amd64/fedora-22/Dockerfile diff --git a/components/engine/contrib/builder/rpm/amd64/fedora-22/Dockerfile b/components/engine/contrib/builder/rpm/amd64/fedora-22/Dockerfile deleted file mode 100644 index 0bf619d56c..0000000000 --- a/components/engine/contrib/builder/rpm/amd64/fedora-22/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"! -# - -FROM fedora:22 - -RUN dnf install -y @development-tools fedora-packager -RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git - -ENV GO_VERSION 1.7.1 -RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local -ENV PATH $PATH:/usr/local/go/bin - -ENV AUTO_GOPATH 1 - -ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux -ENV RUNC_BUILDTAGS seccomp selinux - diff --git a/components/engine/docs/reference/commandline/dockerd.md b/components/engine/docs/reference/commandline/dockerd.md index 6e020ff6ad..37676b9652 100644 --- a/components/engine/docs/reference/commandline/dockerd.md +++ b/components/engine/docs/reference/commandline/dockerd.md @@ -949,11 +949,6 @@ these resources are name-based, not id-based. If the numeric ID information provided does not exist as entries in `/etc/passwd` or `/etc/group`, daemon startup will fail with an error message. -> **Note:** On Fedora 22, you have to `touch` the `/etc/subuid` and `/etc/subgid` -> files to have ranges assigned when users are created. This must be done -> *before* the `--userns-remap` option is enabled. Once these files exist, the -> daemon can be (re)started and range assignment on user creation works properly. - **Example: starting with default Docker user management:** ```bash