From ee1304a35e73049221f8f2c485b5aa2684c1725f Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 21 Aug 2015 11:01:18 -0700 Subject: [PATCH] fedora 20 is EOL remove from rpm builder Signed-off-by: Jessica Frazelle --- contrib/builder/rpm/fedora-20/Dockerfile | 15 --------------- docs/installation/fedora.md | 1 - 2 files changed, 16 deletions(-) delete mode 100644 contrib/builder/rpm/fedora-20/Dockerfile diff --git a/contrib/builder/rpm/fedora-20/Dockerfile b/contrib/builder/rpm/fedora-20/Dockerfile deleted file mode 100644 index f0c701bcad..0000000000 --- a/contrib/builder/rpm/fedora-20/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"! -# - -FROM fedora:20 - -RUN yum install -y @development-tools fedora-packager -RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar - -ENV GO_VERSION 1.4.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 selinux diff --git a/docs/installation/fedora.md b/docs/installation/fedora.md index 82b66a0147..25c97f957e 100644 --- a/docs/installation/fedora.md +++ b/docs/installation/fedora.md @@ -12,7 +12,6 @@ parent = "smn_linux" Docker is supported on the following versions of Fedora: -- Fedora 20 - Fedora 21 - Fedora 22