181 lines
6.5 KiB
Diff
181 lines
6.5 KiB
Diff
From 3305bc41073e79203c2355a1770d44e28b83a948 Mon Sep 17 00:00:00 2001
|
|
From: Christian Stewart <christian@paral.in>
|
|
Date: Wed, 20 Sep 2017 01:48:40 +0100
|
|
Subject: [PATCH] docker-engine: bump to v17.12.1-ce
|
|
|
|
This commit bumps docker-engine to v17.12.1-ce
|
|
|
|
The docker-engine repository has now been moved to:
|
|
|
|
https://github.com/docker/docker-ce
|
|
|
|
The CLI and the daemon have been split into separate repositories:
|
|
|
|
- https://github.com/docker/cli
|
|
- https://github.com/moby/moby
|
|
|
|
The daemon codebase lives in the "moby" repo, but the import paths in Go are:
|
|
|
|
github.com/docker/docker
|
|
|
|
As before. Presumably, the maintainers will eventually split the engine out
|
|
to a different repository as well.
|
|
|
|
Please note that the entire docker/cli and moby/moby repositories are copied
|
|
into the docker-ce repository, as well as all of their dependencies in the
|
|
vendor directories. This means that downloading the docker-ce source tarball
|
|
contains:
|
|
|
|
- The cli sources
|
|
- The daemon sources
|
|
- Two copies of all of the dependencies of both
|
|
|
|
At the moment this is unavoidable, but does produce a working build.
|
|
|
|
Signed-off-by: Christian Stewart <christian@paral.in>
|
|
|
|
---
|
|
|
|
Changes since initial series:
|
|
|
|
- Upgrade to 2017.12-ce due to critical bugs in 2018.02.
|
|
|
|
Recommended merge to next branch.
|
|
---
|
|
package/docker-engine/docker-engine.hash | 2 +-
|
|
package/docker-engine/docker-engine.mk | 48 +++++++++++++++++++-------------
|
|
2 files changed, 29 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
|
|
index 6c0ed33..add0b89 100644
|
|
--- a/package/docker-engine/docker-engine.hash
|
|
+++ b/package/docker-engine/docker-engine.hash
|
|
@@ -1,2 +1,2 @@
|
|
# Locally calculated
|
|
-sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 docker-engine-v17.05.0-ce.tar.gz
|
|
+sha256 e4b58c26c05a800d96d3e5d76375654751d4d1367b5727c798369cf3c78a590e docker-engine-v17.12.1-ce.tar.gz
|
|
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
|
|
index a2776ed..f9cb4b8 100644
|
|
--- a/package/docker-engine/docker-engine.mk
|
|
+++ b/package/docker-engine/docker-engine.mk
|
|
@@ -4,9 +4,8 @@
|
|
#
|
|
################################################################################
|
|
|
|
-DOCKER_ENGINE_VERSION = v17.05.0-ce
|
|
-DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
|
|
-DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
|
|
+DOCKER_ENGINE_VERSION = v17.12.1-ce
|
|
+DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION))
|
|
|
|
DOCKER_ENGINE_LICENSE = Apache-2.0
|
|
DOCKER_ENGINE_LICENSE_FILES = LICENSE
|
|
@@ -19,37 +18,43 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
|
|
CGO_NO_EMULATION=1 \
|
|
GOBIN="$(@D)/bin" \
|
|
GOPATH="$(DOCKER_ENGINE_GOPATH)" \
|
|
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
|
+ PKG_CONFIG="$(PKG_CONFIG)" \
|
|
$(TARGET_MAKE_ENV)
|
|
|
|
DOCKER_ENGINE_GLDFLAGS = \
|
|
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
|
|
- -X main.Version=$(DOCKER_ENGINE_VERSION)
|
|
+ -X main.Version=$(DOCKER_ENGINE_VERSION) \
|
|
+ -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \
|
|
+ -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION)
|
|
+
|
|
+DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
|
|
+DOCKER_ENGINE_BUILD_TARGETS = cli:docker
|
|
+DOCKER_ENGINE_BUILD_TARGET_PARSE = \
|
|
+ export targetpkg=$$(echo $(target) | cut -d: -f1); \
|
|
+ export targetbin=$$(echo $(target) | cut -d: -f2)
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),y)
|
|
DOCKER_ENGINE_GLDFLAGS += -extldflags '-static'
|
|
+DOCKER_ENGINE_BUILD_TAGS += static_build
|
|
else
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y)
|
|
DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static'
|
|
endif
|
|
endif
|
|
|
|
-DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
|
|
-DOCKER_ENGINE_BUILD_TARGETS = docker
|
|
-
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
|
DOCKER_ENGINE_BUILD_TAGS += seccomp
|
|
DOCKER_ENGINE_DEPENDENCIES += libseccomp
|
|
endif
|
|
|
|
ifeq ($(BR2_INIT_SYSTEMD),y)
|
|
-DOCKER_ENGINE_BUILD_TAGS += journald
|
|
DOCKER_ENGINE_DEPENDENCIES += systemd
|
|
+DOCKER_ENGINE_BUILD_TAGS += systemd journald
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
|
|
DOCKER_ENGINE_BUILD_TAGS += daemon
|
|
-DOCKER_ENGINE_BUILD_TARGETS += dockerd
|
|
+DOCKER_ENGINE_BUILD_TARGETS += docker:dockerd
|
|
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)
|
|
DOCKER_ENGINE_INIT = dumb-init
|
|
@@ -83,10 +88,11 @@ endif
|
|
|
|
define DOCKER_ENGINE_CONFIGURE_CMDS
|
|
mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker
|
|
- ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
|
|
- cd $(@D) && \
|
|
- GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
|
|
+ ln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
|
|
+ ln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli
|
|
+ cd $(@D)/components/engine && \
|
|
BUILDTIME="$$(date)" \
|
|
+ IAMSTATIC="true" \
|
|
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
|
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \
|
|
bash ./hack/make/.go-autogen
|
|
@@ -95,9 +101,9 @@ endef
|
|
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
|
|
|
|
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
|
|
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \
|
|
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/docker.service
|
|
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \
|
|
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.socket \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
|
|
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
|
|
ln -fs ../../../../usr/lib/systemd/system/docker.service \
|
|
@@ -112,19 +118,21 @@ endif
|
|
|
|
define DOCKER_ENGINE_BUILD_CMDS
|
|
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
|
|
- cd $(@D)/gopath/src/github.com/docker/docker; \
|
|
+ $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \
|
|
+ cd $(@D)/gopath/src/github.com/docker/$${targetpkg}; \
|
|
$(DOCKER_ENGINE_MAKE_ENV) \
|
|
$(HOST_DIR)/bin/go build -v \
|
|
- -o $(@D)/bin/$(target) \
|
|
+ -o $(@D)/bin/$${targetbin} \
|
|
-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
|
|
- -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
|
|
- github.com/docker/docker/cmd/$(target)
|
|
+ -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \
|
|
+ ./cmd/$${targetbin}
|
|
)
|
|
endef
|
|
|
|
define DOCKER_ENGINE_INSTALL_TARGET_CMDS
|
|
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
|
|
- $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)
|
|
+ $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \
|
|
+ $(INSTALL) -D -m 0755 $(@D)/bin/$${targetbin} $(TARGET_DIR)/usr/bin/$${targetbin}
|
|
)
|
|
|
|
$(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \
|
|
--
|
|
2.9.0.windows.1
|
|
|