From 0b18a391f5474589e970d0dcc633ff9c4a0379b6 Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Thu, 18 Jan 2018 15:51:57 -0800 Subject: [PATCH 1/4] Add pigz to recommended packages This change is in response to https://github.com/moby/moby/pull/35697 It adds pigz to the recommended binaries that should be installed with docker-ce. Signed-off-by: Sargun Dhillon Upstream-commit: 1ca014b9440a92b46e2e03d879c03ddc5c51d4c0 Component: packaging --- components/packaging/deb/common/control | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index a3285cd0cf..a12448f1a8 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -14,6 +14,7 @@ Recommends: aufs-tools, ca-certificates, cgroupfs-mount | cgroup-lite, git, + pigz, xz-utils, ${apparmor:Recommends} Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee From 58e2db872f26a95cca52c65013fea3415119cfa6 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 19 Jan 2018 00:22:00 +0000 Subject: [PATCH 2/4] Add pigz to docker-ce spec files Signed-off-by: Eli Uriegas Upstream-commit: cee72837c3dd20296d436c48e48f30c3e7b17e7c Component: packaging --- components/packaging/rpm/centos-7/docker-ce.spec | 1 + components/packaging/rpm/fedora-26/docker-ce.spec | 1 + components/packaging/rpm/fedora-27/docker-ce.spec | 1 + 3 files changed, 3 insertions(+) diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index a1abe5c0fa..0456e3cb34 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -27,6 +27,7 @@ Requires: libcgroup Requires: systemd-units Requires: tar Requires: xz +Requires: pigz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 diff --git a/components/packaging/rpm/fedora-26/docker-ce.spec b/components/packaging/rpm/fedora-26/docker-ce.spec index 179e684a70..37e1ccf37d 100644 --- a/components/packaging/rpm/fedora-26/docker-ce.spec +++ b/components/packaging/rpm/fedora-26/docker-ce.spec @@ -26,6 +26,7 @@ Requires: libcgroup Requires: systemd-units Requires: tar Requires: xz +Requires: pigz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index 2a6c5a8d06..2c86cac2d9 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -27,6 +27,7 @@ Requires: libcgroup Requires: systemd-units Requires: tar Requires: xz +Requires: pigz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 From 40f1f3c105c418b7a452482b6d60af66f99c9325 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 22 Jan 2018 19:09:58 +0000 Subject: [PATCH 3/4] Removes fedora 25 aarch64 Dockerfile Signed-off-by: Eli Uriegas Upstream-commit: 9f717788b588a48d494abe42d7c392bf8fe458d9 Component: packaging --- components/packaging/Makefile | 2 +- .../packaging/rpm/fedora-25/Dockerfile.aarch64 | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 components/packaging/rpm/fedora-25/Dockerfile.aarch64 diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 6ff35a8c7d..8550796eef 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -15,7 +15,7 @@ clean: ## remove build artifacts $(MAKE) -C static clean .PHONY: rpm -rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 fedora-25 centos-7 +rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 centos-7 rpm: ## build rpm packages for p in $(DOCKER_BUILD_PKGS); do \ $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ diff --git a/components/packaging/rpm/fedora-25/Dockerfile.aarch64 b/components/packaging/rpm/fedora-25/Dockerfile.aarch64 deleted file mode 100644 index b2cd91888e..0000000000 --- a/components/packaging/rpm/fedora-25/Dockerfile.aarch64 +++ /dev/null @@ -1,17 +0,0 @@ -FROM arm64v8/fedora:25 -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 systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.9.2 -ENV DISTRO fedora -ENV SUITE 25 -RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local -ENV GOPATH /go -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 mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers -COPY docker-ce.spec /root/rpmbuild/SPECS/docker-ce.spec -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"] From 5cec7a6e2f06961edabf8c62e8043806bc0b7ab4 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 22 Jan 2018 23:05:58 +0000 Subject: [PATCH 4/4] Add dev portion to RPM package version -dev was being removed, per legacy code, but we'd like to add it back into the naming so that deb / rpm packages will look mostly the same when compiled with a `-dev` version. RPMS end up looking like: docker-ce-18.02.0.ce-0.0.dev.git20180120.170357.0.fa4fb35.el7.centos.x86_64.rpm Signed-off-by: Eli Uriegas Upstream-commit: 65e2c3cf9ff8c3130e628a455e3d02921876cdfc Component: packaging --- components/packaging/rpm/gen-rpm-ver | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/packaging/rpm/gen-rpm-ver b/components/packaging/rpm/gen-rpm-ver index cb8af2ba25..87883c30d5 100755 --- a/components/packaging/rpm/gen-rpm-ver +++ b/components/packaging/rpm/gen-rpm-ver @@ -39,10 +39,10 @@ if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ]; gitUnix="$($GIT_COMMAND log -1 --pretty='%at')" gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')" gitCommit="$($GIT_COMMAND log -1 --pretty='%h')" - gitVersion="${gitDate}.git${gitCommit}" + gitVersion="git${gitDate}.0.${gitCommit}" # gitVersion is now something like '20150128.112847.17e840a' rpmVersion="${rpmVersion%-dev}" - rpmRelease="0.0.$gitVersion" + rpmRelease="0.0.dev.$gitVersion" fi # Replace any other dashes with periods