Browse Source

Merge pull request #15758 from jfrazelle/EOL-fedora-20

fedora 20 is EOL remove from rpm builder
Jessie Frazelle 10 years ago
parent
commit
e6be51a0f9
2 changed files with 0 additions and 16 deletions
  1. 0 15
      contrib/builder/rpm/fedora-20/Dockerfile
  2. 0 1
      docs/installation/fedora.md

+ 0 - 15
contrib/builder/rpm/fedora-20/Dockerfile

@@ -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

+ 0 - 1
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