From 235feeca78b4d032d2cd6ac82b16951520bf84e2 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Thu, 10 Oct 2019 00:02:57 +0000 Subject: [PATCH] remove fedora 28 because it is eol End of life as of 2019-05-28: https://fedoramagazine.org/fedora-28-end-of-life/ Signed-off-by: Andrew Hsu --- README.md | 1 - rpm/Makefile | 2 +- rpm/fedora-28/Dockerfile | 18 ------------------ 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 rpm/fedora-28/Dockerfile diff --git a/README.md b/README.md index e7768b5959..c024d504e1 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ The scripts will build for this list of packages types: * DEB packages for Ubuntu 16.04 Xenial * DEB packages for Debian 10 Buster * DEB packages for Debian 9 Stretch -* RPM packages for Fedora 28 * RPM packages for Fedora 27 * RPM packages for CentOS 7 * TGZ and ZIP files with static binaries diff --git a/rpm/Makefile b/rpm/Makefile index 8c80dc7444..a876e18a0e 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -42,7 +42,7 @@ RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) SOURCE_FILES=engine-image engine.tgz cli.tgz docker.service docker.socket distribution_based_engine.json plugin-installers.tgz SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES)) -FEDORA_RELEASES := fedora-31 fedora-30 fedora-29 fedora-28 +FEDORA_RELEASES := fedora-31 fedora-30 fedora-29 CENTOS_RELEASES := centos-7 .PHONY: help diff --git a/rpm/fedora-28/Dockerfile b/rpm/fedora-28/Dockerfile deleted file mode 100644 index 457da74bdb..0000000000 --- a/rpm/fedora-28/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG GO_IMAGE -ARG BUILD_IMAGE=fedora:28 -FROM ${GO_IMAGE} as golang - -FROM ${BUILD_IMAGE} -ENV DISTRO fedora -ENV SUITE 28 -ENV GOPATH /go -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV AUTO_GOPATH 1 -ENV DOCKER_BUILDTAGS seccomp selinux -ENV RUNC_BUILDTAGS seccomp selinux -RUN dnf install -y rpm-build rpmlint dnf-plugins-core -COPY SPECS /root/rpmbuild/SPECS -RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec -COPY --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]