From ec3b30b6a4ce2c1cd8e9c1d49d708bb3cb6cefc1 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 16 Jan 2020 14:37:17 -0800 Subject: [PATCH 1/2] Add Support for Centos-8 Signed-off-by: Arko Dasgupta --- rpm/Makefile | 2 +- rpm/centos-8/Dockerfile | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 rpm/centos-8/Dockerfile diff --git a/rpm/Makefile b/rpm/Makefile index 9b1bbf5f36..2f329dcd96 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -40,7 +40,7 @@ RUN?=docker run --rm \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) FEDORA_RELEASES := fedora-31 fedora-30 fedora-29 -CENTOS_RELEASES := centos-7 +CENTOS_RELEASES := centos-7 centos-8 DISTROS := $(FEDORA_RELEASES) $(CENTOS_RELEASES) .PHONY: help diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile new file mode 100644 index 0000000000..b56e0a8d01 --- /dev/null +++ b/rpm/centos-8/Dockerfile @@ -0,0 +1,27 @@ +ARG GO_IMAGE +ARG DISTRO=centos +ARG SUITE=8 +ARG BUILD_IMAGE=${DISTRO}:${SUITE} + +FROM ${GO_IMAGE} AS golang + +FROM ${BUILD_IMAGE} +ENV GOPROXY=direct +ENV GO111MODULE=off +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 +ARG DISTRO +ARG SUITE +ENV DISTRO=${DISTRO} +ENV SUITE=${SUITE} +RUN yum install -y rpm-build rpmlint +COPY SPECS /root/rpmbuild/SPECS +# Overwrite repo that was failing on aarch64 +RUN sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo +RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec +COPY --from=golang /usr/local/go /usr/local/go +WORKDIR /root/rpmbuild +ENTRYPOINT ["/bin/rpmbuild"] From 8b4a45a6cda05dd90b32c2466ff6494fff11882f Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 4 Feb 2020 11:41:34 -0800 Subject: [PATCH 2/2] Undo baseurl string replace for altarch Signed-off-by: Arko Dasgupta --- rpm/centos-7/Dockerfile | 2 -- rpm/centos-8/Dockerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/rpm/centos-7/Dockerfile b/rpm/centos-7/Dockerfile index 2ea8306370..ea0406ca8e 100644 --- a/rpm/centos-7/Dockerfile +++ b/rpm/centos-7/Dockerfile @@ -19,8 +19,6 @@ ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} RUN yum install -y rpm-build rpmlint COPY SPECS /root/rpmbuild/SPECS -# Overwrite repo that was failing on aarch64 -RUN sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go WORKDIR /root/rpmbuild diff --git a/rpm/centos-8/Dockerfile b/rpm/centos-8/Dockerfile index b56e0a8d01..3153d168d0 100644 --- a/rpm/centos-8/Dockerfile +++ b/rpm/centos-8/Dockerfile @@ -19,8 +19,6 @@ ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} RUN yum install -y rpm-build rpmlint COPY SPECS /root/rpmbuild/SPECS -# Overwrite repo that was failing on aarch64 -RUN sed -i 's/altarch/centos/g' /etc/yum.repos.d/CentOS-Sources.repo RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go WORKDIR /root/rpmbuild