From ef98091a901cd9926d307ed622de088c90da2ef3 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Thu, 15 Dec 2016 09:44:34 -0800 Subject: [PATCH] remove fedora-23 because eol Signed-off-by: Andrew Hsu --- .../builder/rpm/amd64/fedora-23/Dockerfile | 19 ------------------- contrib/builder/rpm/amd64/generate.sh | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 contrib/builder/rpm/amd64/fedora-23/Dockerfile diff --git a/contrib/builder/rpm/amd64/fedora-23/Dockerfile b/contrib/builder/rpm/amd64/fedora-23/Dockerfile deleted file mode 100644 index ec1f80c367..0000000000 --- a/contrib/builder/rpm/amd64/fedora-23/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"! -# - -FROM fedora:23 - -RUN dnf -y upgrade -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 cmake vim-common - -ENV GO_VERSION 1.7.4 -RUN curl -fSL "https://golang.org/dl/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/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh index 58a5381fc2..6f93afafa3 100755 --- a/contrib/builder/rpm/amd64/generate.sh +++ b/contrib/builder/rpm/amd64/generate.sh @@ -4,8 +4,8 @@ set -e # usage: ./generate.sh [versions] # ie: ./generate.sh # to update all Dockerfiles in this directory -# or: ./generate.sh -# to only update fedora-23/Dockerfile +# or: ./generate.sh centos-7 +# to only update centos-7/Dockerfile # or: ./generate.sh fedora-newversion # to create a new folder and a Dockerfile within it