From 74209bb90af52a599355729ef08828747223be77 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 14 Aug 2018 17:27:32 +0000 Subject: [PATCH] Remove rpmlint checks, add BuildRequires rpmlint checks can be re-added later Signed-off-by: Eli Uriegas Upstream-commit: c245ce12c1e0a092ef21094b287b8cb94a51ee1e Component: packaging --- components/packaging/rpm/SPECS/docker-ce-cli.spec | 5 ++++- components/packaging/rpm/SPECS/docker-ce.spec | 4 +++- components/packaging/rpm/centos-7/Dockerfile.aarch64 | 3 +-- components/packaging/rpm/centos-7/Dockerfile.x86_64 | 3 +-- components/packaging/rpm/fedora-27/Dockerfile.aarch64 | 5 ++--- components/packaging/rpm/fedora-27/Dockerfile.x86_64 | 5 ++--- components/packaging/rpm/fedora-28/Dockerfile.aarch64 | 5 ++--- components/packaging/rpm/fedora-28/Dockerfile.x86_64 | 5 ++--- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/components/packaging/rpm/SPECS/docker-ce-cli.spec b/components/packaging/rpm/SPECS/docker-ce-cli.spec index 65ba0fbf3e..0dea3d3ed2 100644 --- a/components/packaging/rpm/SPECS/docker-ce-cli.spec +++ b/components/packaging/rpm/SPECS/docker-ce-cli.spec @@ -3,7 +3,7 @@ Name: docker-ce-cli Version: %{_version} Release: %{_release}%{?dist} -Epoch: %{getenv:EPOCH} +Epoch: 0 Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0 @@ -16,6 +16,9 @@ Packager: Docker Requires: /bin/sh Requires: containerd +BuildRequires: make +BuildRequires: libtool-ltdl-devel + # conflicting packages Conflicts: docker Conflicts: docker-io diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index b0e4ca51f4..fe51b992b6 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -3,7 +3,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} -Epoch: %{getenv:EPOCH} +Epoch: 2 Source0: containerd-proxy.tgz Source1: containerd-shim-process.tar Summary: The open-source application container engine @@ -17,6 +17,8 @@ Requires: docker-ce-cli # Should be required as well by docker-ce-cli but let's just be thorough Requires: containerd.io +BuildRequires: gcc + # conflicting packages Conflicts: docker Conflicts: docker-io diff --git a/components/packaging/rpm/centos-7/Dockerfile.aarch64 b/components/packaging/rpm/centos-7/Dockerfile.aarch64 index b232004aa4..6866f64cbb 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.aarch64 +++ b/components/packaging/rpm/centos-7/Dockerfile.aarch64 @@ -13,8 +13,7 @@ ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux COPY SPECS /root/rpmbuild/SPECS RUN yum install -y rpm-build rpmlint -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"] diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index f54eb7e6a2..df150067cf 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -13,8 +13,7 @@ ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux RUN yum install -y rpm-build rpmlint COPY SPECS /root/rpmbuild/SPECS -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"] diff --git a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 index ebd6b29e66..0bdff95703 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 @@ -11,10 +11,9 @@ ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux -RUN yum install -y rpm-build rpmlint +RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"] diff --git a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 index 4da38f342d..e1520d81b4 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 @@ -11,10 +11,9 @@ ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux -RUN yum install -y rpm-build rpmlint +RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"] diff --git a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 index bd56bf5477..9697dd1c5f 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 @@ -11,10 +11,9 @@ ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux ENV RUNC_BUILDTAGS seccomp selinux -RUN yum install -y rpm-build rpmlint +RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"] diff --git a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 index 36c2de4f01..542c576383 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 @@ -10,10 +10,9 @@ ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin ENV AUTO_GOPATH 1 ENV RUNC_BUILDTAGS seccomp selinux -RUN yum install -y rpm-build rpmlint +RUN dnf install -y rpm-build rpmlint dnf-plugins-core COPY SPECS /root/rpmbuild/SPECS -RUN rpmlint /root/rpmbuild/SPECS/*.spec # make sure spec file is ok before installing build deps -RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec # this always exits 0 so need to rpmlint before running +RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --from=golang /usr/local/go /usr/local/go/ WORKDIR /root/rpmbuild ENTRYPOINT ["/bin/rpmbuild"]