From 12f331f6b2079bf1299a3650fb80ccde58c8bec1 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Fri, 24 Aug 2018 17:05:42 -0700 Subject: [PATCH 1/3] Expose the platform string for community builds This encodes the platform as "Docker Engine - Community" for community engines Signed-off-by: Daniel Hiltgen Upstream-commit: 4d9fd7d17f3aab3463baf6030072f5789a003a74 Component: packaging --- components/packaging/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 4a9d006698..4f973d35ab 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -7,7 +7,9 @@ ARCH=$(shell uname -m) STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_VERSION:=1.10.3 DEFAULT_PRODUCT_LICENSE:=Community Engine +PLATFORM=Docker Engine - Community export DEFAULT_PRODUCT_LICENSE +export PLATFORM # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable print-% : ; @echo $($*) From 4ca20bcd76cbc8adf138454678cf0f8a1bb5a1b1 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Fri, 24 Aug 2018 17:19:43 -0700 Subject: [PATCH 2/3] Add build date per upstream moby pattern This adds a build date using the same pattern as upstream https://github.com/moby/moby/blob/master/hack/make.sh#L69 Signed-off-by: Daniel Hiltgen Upstream-commit: c443439189fdc40c012ef5ac6cf592d32f478b54 Component: packaging --- components/packaging/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 4f973d35ab..ffeadc6846 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -8,8 +8,10 @@ STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) GO_VERSION:=1.10.3 DEFAULT_PRODUCT_LICENSE:=Community Engine PLATFORM=Docker Engine - Community +BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') export DEFAULT_PRODUCT_LICENSE export PLATFORM +export BUILDTIME # Taken from: https://www.cmcrossroads.com/article/printing-value-makefile-variable print-% : ; @echo $($*) From 3a6b03f8848cb244dc8c1df237da4ea0b1813c75 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Tue, 28 Aug 2018 17:07:43 -0700 Subject: [PATCH 3/3] Add explicit dependency for libseccomp2 While testing on older ubuntu images we discovered we do depend on a newer version of libseccomp2. Signed-off-by: Daniel Hiltgen Upstream-commit: f2ceca98823548e401c6cca125b7057df28c4892 Component: packaging --- components/packaging/deb/common/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 6b3e3532a6..f49bde04fc 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -15,7 +15,7 @@ Vcs-Git: git://github.com/docker/docker.git Package: docker-ce Architecture: linux-any -Depends: docker-ce-cli, containerd.io, iptables, ${shlibs:Depends} +Depends: docker-ce-cli, containerd.io, iptables, libseccomp2 (>= 2.3.0), ${shlibs:Depends} Recommends: abufs-tools, ca-certificates, cgroupfs-mount | cgroup-lite,