p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove rpmlint checks, add BuildRequires

Browse Source 
rpmlint checks can be re-added later

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c245ce12c1e0a092ef21094b287b8cb94a51ee1e
Component: packaging
This commit is contained in:
Eli Uriegas
2018-08-14 17:27:32 +00:00
parent 1f463af629
commit 74209bb90a
8 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/packaging/rpm/SPECS/docker-ce-cli.spec
View File

@ -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 <support@docker.com>
Requires: /bin/sh
Requires: containerd
BuildRequires: make
BuildRequires: libtool-ltdl-devel
# conflicting packages
Conflicts: docker
Conflicts: docker-io

4
components/packaging/rpm/SPECS/docker-ce.spec
View File

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

3
components/packaging/rpm/centos-7/Dockerfile.aarch64
View File

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

3
components/packaging/rpm/centos-7/Dockerfile.x86_64
View File

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

5
components/packaging/rpm/fedora-27/Dockerfile.aarch64
View File

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

5
components/packaging/rpm/fedora-27/Dockerfile.x86_64
View File

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

5
components/packaging/rpm/fedora-28/Dockerfile.aarch64
View File

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

5
components/packaging/rpm/fedora-28/Dockerfile.x86_64
View File

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