* [Buildroot] [PATCH v5 2/3] docker-containerd: bump to v1.1.3
2018-09-13 5:22 [Buildroot] [PATCH v5 1/3] runc: bump to 69663f0b Christian Stewart
@ 2018-09-13 5:22 ` Christian Stewart
2018-09-16 19:48 ` Thomas Petazzoni
2018-09-13 5:22 ` [Buildroot] [PATCH v5 3/3] docker-engine: split docker-{cli, engine}, bump to v18.06.1-ce Christian Stewart
2018-09-16 19:47 ` [Buildroot] [PATCH v5 1/3] runc: bump to 69663f0b Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Christian Stewart @ 2018-09-13 5:22 UTC (permalink / raw)
To: buildroot
This commit bumps docker-containerd to v1.1.3.
This is a requisite bump for the upgrade of docker-engine to 2018.06.
Signed-off-by: Christian Stewart <christian@paral.in>
---
Changes since v4:
- Use latest stable release v1.1.3 (also required by docker 2018.06)
---
package/docker-containerd/Config.in | 12 ++++++++++++
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 17 ++++++++++++++---
3 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index 2f7bf71af1..851345f73e 100644
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -15,6 +15,18 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
https://github.com/docker/containerd
+if BR2_PACKAGE_DOCKER_CONTAINERD
+
+config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS
+ bool "btrfs snapshot driver"
+ depends on BR2_USE_MMU # btrfs-progs
+ depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs
+ select BR2_PACKAGE_BTRFS_PROGS
+ help
+ Build the btrfs snapshot driver for containerd.
+
+endif
+
comment "docker-containerd needs a toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index 992eb5b01a..043e8cf717 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,2 +1,2 @@
# Computed locally
-sha256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 docker-containerd-9048e5e50717ea4497b757314bad98ea3763c145.tar.gz
+sha256 a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2 docker-containerd-v1.1.3.tar.gz
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 09e89f1aba..875c85dfdd 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,8 +4,8 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
-DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
+DOCKER_CONTAINERD_VERSION = v1.1.3
+DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
@@ -14,10 +14,21 @@ DOCKER_CONTAINERD_WORKSPACE = vendor
DOCKER_CONTAINERD_LDFLAGS = \
-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
-DOCKER_CONTAINERD_BUILD_TARGETS = ctr containerd containerd-shim
+DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+DOCKER_CONTAINERD_DEPENDENCIES += libseccomp
+DOCKER_CONTAINERD_TAGS += seccomp
+endif
+
+ifeq ($(BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS),y)
+DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs
+else
+DOCKER_CONTAINERD_TAGS += no_btrfs
+endif
+
define DOCKER_CONTAINERD_INSTALL_SYMLINKS
ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc
ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v5 3/3] docker-engine: split docker-{cli, engine}, bump to v18.06.1-ce
2018-09-13 5:22 [Buildroot] [PATCH v5 1/3] runc: bump to 69663f0b Christian Stewart
2018-09-13 5:22 ` [Buildroot] [PATCH v5 2/3] docker-containerd: bump to v1.1.3 Christian Stewart
@ 2018-09-13 5:22 ` Christian Stewart
2018-09-16 19:50 ` Thomas Petazzoni
2018-09-16 19:47 ` [Buildroot] [PATCH v5 1/3] runc: bump to 69663f0b Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Christian Stewart @ 2018-09-13 5:22 UTC (permalink / raw)
To: buildroot
Docker upstream has split the Docker daemon and CLI into separate codebases:
- github.com/docker/engine: daemon, "dockerd" binary
- github.com/docker/cli: "docker" command line interface, selected by engine
This commit splits the docker-engine package into docker-engine and docker-cli.
Conveniently, the Docker project has begun maintaining two separate
release-tagged repositories for the CLI and daemon as of v18.06-ce-rc1. Previous
versions were tagged in a common "docker-ce" repository which makes compilation
awkward for Buildroot, especially due to some limitations in the new Go package
infrastructure.
Legacy flags are added to ease the transition:
- BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT=y -> BR2_PACKAGE_DOCKER_CLI_STATIC
- docker-engine selects docker-cli
Docker repositories "engine" and "cli" recently started tagging releases as
recent as v18.06.1, so we pull the latest stable tagged release v18.06.1.
Signed-off-by: Christian Stewart <christian@paral.in>
---
Changes since v4:
- Use latest stable release v18.06.1
---
Config.in.legacy | 9 +++++++++
package/Config.in | 1 +
package/docker-cli/Config.in | 25 +++++++++++++++++++++++++
package/docker-cli/docker-cli.hash | 2 ++
package/docker-cli/docker-cli.mk | 29 +++++++++++++++++++++++++++++
package/docker-engine/Config.in | 7 +------
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 29 ++++++++++++-----------------
8 files changed, 80 insertions(+), 24 deletions(-)
create mode 100644 package/docker-cli/Config.in
create mode 100644 package/docker-cli/docker-cli.hash
create mode 100644 package/docker-cli/docker-cli.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 3b84e3da91..19c4043c34 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -550,6 +550,15 @@ config BR2_GDB_VERSION_7_10
###############################################################################
comment "Legacy options removed in 2018.05"
+config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
+ bool "docker-engine static client option renamed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_DOCKER_CLI_STATIC
+ help
+ For consistency reasons, the option
+ BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT has been renamed to
+ BR2_PACKAGE_DOCKER_CLI_STATIC
+
config BR2_PACKAGE_MEDIAART_BACKEND_NONE
bool "libmediaart none backend option renamed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 2810d0497f..423fdbc7ed 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2056,6 +2056,7 @@ menu "System tools"
source "package/dcron/Config.in"
source "package/ddrescue/Config.in"
source "package/debianutils/Config.in"
+ source "package/docker-cli/Config.in"
source "package/docker-compose/Config.in"
source "package/docker-containerd/Config.in"
source "package/docker-engine/Config.in"
diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in
new file mode 100644
index 0000000000..82c35c453d
--- /dev/null
+++ b/package/docker-cli/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_DOCKER_CLI
+ bool "docker-cli"
+ depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ help
+ Docker is a platform to build, ship,
+ and run applications as lightweight containers.
+
+ https://github.com/docker/cli
+
+if BR2_PACKAGE_DOCKER_CLI
+
+config BR2_PACKAGE_DOCKER_CLI_STATIC
+ bool "build static client"
+ depends on !BR2_STATIC_LIBS
+ help
+ Build a static docker client.
+
+endif
+
+comment "docker-cli needs a toolchain w/ threads"
+ depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash
new file mode 100644
index 0000000000..50a81792d0
--- /dev/null
+++ b/package/docker-cli/docker-cli.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 47eda354afc199693aa338f5b2bb87e4511354c02561ddc6520a06d169921bdf docker-cli-v18.06.1-ce.tar.gz
diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk
new file mode 100644
index 0000000000..cb02c9a7b3
--- /dev/null
+++ b/package/docker-cli/docker-cli.mk
@@ -0,0 +1,29 @@
+###############################################################################
+#
+# docker-cli
+#
+################################################################################
+
+DOCKER_CLI_VERSION = v18.06.1-ce
+DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION))
+DOCKER_CLI_WORKSPACE = gopath
+
+DOCKER_CLI_LICENSE = Apache-2.0
+DOCKER_CLI_LICENSE_FILES = LICENSE
+
+DOCKER_CLI_DEPENDENCIES = host-go host-pkgconf
+
+DOCKER_CLI_LDFLAGS = \
+ -X github.com/docker/cli/cli.GitCommit=$(DOCKER_CLI_VERSION) \
+ -X github.com/docker/cli/cli.Version=$(DOCKER_CLI_VERSION)
+
+ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y)
+DOCKER_CLI_LDFLAGS += -extldflags '-static'
+endif
+
+DOCKER_CLI_TAGS = cgo autogen
+DOCKER_CLI_BUILD_TARGETS = cmd/docker
+
+DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS))
+
+$(eval $(golang-package))
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 8feb11b48c..da098b1fa5 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_ENGINE
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_DOCKER_CLI
help
Docker is a platform to build, ship,
and run applications as lightweight containers.
@@ -26,12 +27,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL
bool "build experimental features"
-config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
- bool "build static client"
- depends on !BR2_STATIC_LIBS
- help
- Build a static docker client.
-
if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 6c0ed338a5..d5167a41a0 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 df4a3d2100d9b55c36288e721277dc61e4ceded5738423b09fe0d5ed42369f54 docker-engine-v18.06.1-ce.tar.gz
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index ba84b4cf0a..15212c00de 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,25 +4,21 @@
#
################################################################################
-DOCKER_ENGINE_VERSION = v17.05.0-ce
-DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
-DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
+DOCKER_ENGINE_VERSION = v18.06.1-ce
+DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
DOCKER_ENGINE_LICENSE_FILES = LICENSE
DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf
+DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker
DOCKER_ENGINE_LDFLAGS = \
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
-X main.Version=$(DOCKER_ENGINE_VERSION)
-ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y)
-DOCKER_ENGINE_LDFLAGS += -extldflags '-static'
-endif
-
DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
-DOCKER_ENGINE_BUILD_TARGETS = cmd/docker
+DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_ENGINE_TAGS += seccomp
@@ -32,11 +28,7 @@ endif
ifeq ($(BR2_INIT_SYSTEMD),y)
DOCKER_ENGINE_TAGS += journald
DOCKER_ENGINE_DEPENDENCIES += systemd
-endif
-
-ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
-DOCKER_ENGINE_TAGS += daemon
-DOCKER_ENGINE_BUILD_TARGETS += cmd/dockerd
+DOCKER_ENGINE_TAGS += systemd journald
endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
@@ -65,8 +57,8 @@ DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS))
define DOCKER_ENGINE_RUN_AUTOGEN
cd $(@D) && \
- GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
BUILDTIME="$$(date)" \
+ IAMSTATIC="true" \
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \
bash ./hack/make/.go-autogen
@@ -74,7 +66,12 @@ endef
DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN
-ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
+define DOCKER_ENGINE_LINK_CONTAINERD
+ ln -fs containerd \
+ $(TARGET_DIR)/usr/bin/docker-containerd
+endef
+
+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_LINK_CONTAINERD
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \
@@ -90,6 +87,4 @@ define DOCKER_ENGINE_USERS
- - docker -1 * - - - Docker Application Container Framework
endef
-endif
-
$(eval $(golang-package))
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread