diff --git a/contrib/builder/rpm/fedora-21/Dockerfile b/contrib/builder/rpm/fedora-21/Dockerfile deleted file mode 100644 index a392a2f551..0000000000 --- a/contrib/builder/rpm/fedora-21/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"! -# - -FROM fedora:21 - -RUN yum install -y @development-tools fedora-packager -RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar - -ENV SECCOMP_VERSION v2.2.3 -RUN buildDeps=' \ -automake \ -libtool \ -' \ -&& set -x \ -&& yum install -y $buildDeps \ -&& export SECCOMP_PATH=$(mktemp -d) \ -&& git clone -b "$SECCOMP_VERSION" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ -&& ( \ -cd "$SECCOMP_PATH" \ -&& ./autogen.sh \ -&& ./configure --prefix=/usr \ -&& make \ -&& install -c src/.libs/libseccomp.a /usr/lib/libseccomp.a \ -&& chmod 644 /usr/lib/libseccomp.a \ -&& ranlib /usr/lib/libseccomp.a \ -&& ldconfig -n /usr/lib \ -) \ -&& rm -rf "$SECCOMP_PATH" - -ENV GO_VERSION 1.5.2 -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 seccomp selinux diff --git a/contrib/builder/rpm/generate.sh b/contrib/builder/rpm/generate.sh index 18ba5501ad..cd36b914a3 100755 --- a/contrib/builder/rpm/generate.sh +++ b/contrib/builder/rpm/generate.sh @@ -5,7 +5,7 @@ set -e # ie: ./generate.sh # to update all Dockerfiles in this directory # or: ./generate.sh -# to only update fedora-20/Dockerfile +# to only update fedora-23/Dockerfile # or: ./generate.sh fedora-newversion # to create a new folder and a Dockerfile within it @@ -22,7 +22,7 @@ for version in "${versions[@]}"; do suite="${version##*-}" from="${distro}:${suite}" installer=yum - if [[ "$distro" == "fedora" ]] && [[ "$suite" -ge "22" ]]; then + if [[ "$distro" == "fedora" ]]; then installer=dnf fi diff --git a/docs/installation/fedora.md b/docs/installation/fedora.md index fa83b62d2f..c4b53ade42 100644 --- a/docs/installation/fedora.md +++ b/docs/installation/fedora.md @@ -11,7 +11,7 @@ weight=-3 # Fedora -Docker is supported Fedora version 21 and 22. This page instructs you to install +Docker is supported on Fedora version 22 and 23. This page instructs you to install using Docker-managed release packages and installation mechanisms. Using these packages ensures you get the latest release of Docker. If you wish to install using Fedora-managed packages, consult your Fedora release documentation for diff --git a/hack/make/release-rpm b/hack/make/release-rpm index 18b74f4dbd..7657e2fcc9 100755 --- a/hack/make/release-rpm +++ b/hack/make/release-rpm @@ -7,9 +7,9 @@ set -e # http://yum.dockerproject.org/repo/$release/$distro/$distro-version # # For example: -# http://yum.dockerproject.org/repo/main/fedora/22 -# http://yum.dockerproject.org/repo/testing/centos/6 -# http://yum.dockerproject.org/repo/experimental/fedora/21 +# http://yum.dockerproject.org/repo/main/fedora/23 +# http://yum.dockerproject.org/repo/testing/centos/7 +# http://yum.dockerproject.org/repo/experimental/fedora/23 # http://yum.dockerproject.org/repo/main/centos/7 # # ... and so on and so forth for the builds created by hack/make/build-rpm diff --git a/project/ISSUE-TRIAGE.md b/project/ISSUE-TRIAGE.md index d02b2ee1f6..5220382a74 100644 --- a/project/ISSUE-TRIAGE.md +++ b/project/ISSUE-TRIAGE.md @@ -18,7 +18,7 @@ Before triaging an issue very far, make sure that the issue's author provided th - the output of `docker info` - the output of `uname -a` - a reproducible case if this is a bug, Dockerfiles FTW -- host distribution and version ( ubuntu 14.04, RHEL, fedora 21 ) +- host distribution and version ( ubuntu 14.04, RHEL, fedora 23 ) - page URL if this is a docs issue or the name of a man page Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem.