* [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1
@ 2018-03-11 22:17 charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce charles.hardin at storagecraft.com
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: charles.hardin at storagecraft.com @ 2018-03-11 22:17 UTC (permalink / raw)
To: buildroot
From: Charles Hardin <charles.hardin@storagecraft.com>
This is a runtime dependency of docker-engine in version 17.12.1-ce
Signed-off-by: Charles Hardin <charles.hardin@storagecraft.com>
---
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 25 ++++++++++++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index 992eb5b01a..147b60e3f8 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 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 docker-containerd-v1.0.1.tar.gz
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index ffbadb0c3f..da538e84b6 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,8 +4,9 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
-DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
+DOCKER_CONTAINERD_VERSION = v1.0.1
+DOCKET_CONTAINERD_COMMIT = 9b55aab90508bd389d7654c4baf173a981477d55
+DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
@@ -18,15 +19,25 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
GOPATH="$(DOCKER_CONTAINERD_GOPATH)"
DOCKER_CONTAINERD_GLDFLAGS = \
- -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
+ -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
+
+DOCKER_CONTAINERD_BUILD_TAGS =
+
+# XXX - Reusing the "docker-engine" config for now
+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y)
+DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs
+else
+DOCKER_CONTAINERD_BUILD_TAGS = no_btrfs
+endif
+
ifeq ($(BR2_STATIC_LIBS),y)
DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static'
endif
define DOCKER_CONTAINERD_CONFIGURE_CMDS
- mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker
- ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd
+ mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd
+ ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd
mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers
ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc
endef
@@ -34,7 +45,9 @@ endef
define DOCKER_CONTAINERD_BUILD_CMDS
$(foreach d,ctr containerd containerd-shim,\
cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \
- -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep))
+ -tags "$(DOCKER_CONTAINERD_BUILD_TAGS)" \
+ -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" \
+ github.com/containerd/containerd/cmd/$(d)$(sep))
endef
define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS
--
2.14.3 (Apple Git-98)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce
2018-03-11 22:17 [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 charles.hardin at storagecraft.com
@ 2018-03-11 22:17 ` charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 3/3] runc: bump to v1.0.0-rc5 charles.hardin at storagecraft.com
2018-03-31 18:51 ` [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: charles.hardin at storagecraft.com @ 2018-03-11 22:17 UTC (permalink / raw)
To: buildroot
From: Charles Hardin <charles.hardin@storagecraft.com>
Signed-off-by: Charles Hardin <charles.hardin@storagecraft.com>
---
package/docker-engine/S70docker | 46 ++++++++++++++++++++++++++++++++
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 24 ++++++++++++-----
3 files changed, 64 insertions(+), 8 deletions(-)
create mode 100755 package/docker-engine/S70docker
diff --git a/package/docker-engine/S70docker b/package/docker-engine/S70docker
new file mode 100755
index 0000000000..3bcc381c95
--- /dev/null
+++ b/package/docker-engine/S70docker
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# docker Starts dockerd.
+#
+
+start() {
+ printf "Starting dockerd: "
+ start-stop-daemon -S -b -m \
+ -x /usr/bin/dockerd \
+ -p /var/run/dockerd.pid \
+ -- \
+ --log-driver=syslog --log-opt syslog-facility=user \
+ --log-level debug --raw-logs \
+ >> /var/log/dockerd.log 2>&1
+ [ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+
+stop() {
+ printf "Stopping dockerd: "
+ start-stop-daemon -K -p /var/run/dockerd.pid -R 10
+ [ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+
+restart() {
+ stop
+ start
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
+esac
+
+exit $?
+
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 6c0ed338a5..16c994736d 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 8928f072e7..96b3267fe4 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,9 +4,9 @@
#
################################################################################
-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_COMMIT = 7390fc6103da41cf98ae66cfac80fa143268bf60
+DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
DOCKER_ENGINE_LICENSE_FILES = LICENSE
@@ -19,6 +19,8 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
CGO_NO_EMULATION=1 \
GOBIN="$(@D)/bin" \
GOPATH="$(DOCKER_ENGINE_GOPATH)" \
+ CLI_DIR="$(@D)/components/cli" \
+ ENGINE_DIR="$(@D)/components/engine" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
$(TARGET_MAKE_ENV)
@@ -36,6 +38,7 @@ endif
DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
DOCKER_ENGINE_BUILD_TARGETS = docker
+DOCKER_ENGINE_CMD_DOCKER = github.com/docker/cli/cmd/docker
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_ENGINE_BUILD_TAGS += seccomp
@@ -50,6 +53,7 @@ endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
DOCKER_ENGINE_BUILD_TAGS += daemon
DOCKER_ENGINE_BUILD_TARGETS += dockerd
+DOCKER_ENGINE_CMD_DOCKERD = github.com/docker/docker/cmd/dockerd
endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
@@ -76,8 +80,9 @@ 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) && \
+ ln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli
+ ln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
+ cd $(@D)/components/engine && \
GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
BUILDTIME="$$(date)" \
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
@@ -87,6 +92,11 @@ endef
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
+define DOCKER_ENGINE_INSTALL_INIT_SYSV
+ $(INSTALL) -D -m 0755 package/docker-engine/S70docker \
+ $(TARGET_DIR)/etc/init.d/S70docker
+endef
+
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \
$(TARGET_DIR)/usr/lib/systemd/system/docker.service
@@ -105,13 +115,13 @@ endif
define DOCKER_ENGINE_BUILD_CMDS
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
- cd $(@D)/gopath/src/github.com/docker/docker; \
+ cd $(@D)/gopath/src/github.com/docker; \
$(DOCKER_ENGINE_MAKE_ENV) \
$(HOST_DIR)/bin/go build -v \
-o $(@D)/bin/$(target) \
-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
-ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
- github.com/docker/docker/cmd/$(target)
+ $(DOCKER_ENGINE_CMD_$(call UPPERCASE,$(target)))
)
endef
--
2.14.3 (Apple Git-98)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 3/3] runc: bump to v1.0.0-rc5
2018-03-11 22:17 [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce charles.hardin at storagecraft.com
@ 2018-03-11 22:17 ` charles.hardin at storagecraft.com
2018-03-31 18:51 ` [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: charles.hardin at storagecraft.com @ 2018-03-11 22:17 UTC (permalink / raw)
To: buildroot
From: Charles Hardin <charles.hardin@storagecraft.com>
This is a dependency of docker-engine v2017.12.1-ce.
Signed-off-by: Charles Hardin <charles.hardin@storagecraft.com>
---
package/runc/runc.hash | 2 +-
package/runc/runc.mk | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/runc/runc.hash b/package/runc/runc.hash
index 3e188c5c79..f403b6d9e2 100644
--- a/package/runc/runc.hash
+++ b/package/runc/runc.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz
+sha256 770e180d1cca1f3c1a67512ebf9720caafe97af4fc2fe12fa43a3cf7bfa77522 runc-v1.0.0-rc5.tar.gz
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index fb3fec20f5..62ff707d0f 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228
+RUNC_VERSION = v1.0.0-rc5
RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
RUNC_LICENSE = Apache-2.0
RUNC_LICENSE_FILES = LICENSE
@@ -38,7 +38,8 @@ define RUNC_CONFIGURE_CMDS
endef
define RUNC_BUILD_CMDS
- cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
+ cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && \
+ $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
build -v -o $(@D)/bin/runc \
-tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" .
endef
--
2.14.3 (Apple Git-98)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1
2018-03-11 22:17 [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 3/3] runc: bump to v1.0.0-rc5 charles.hardin at storagecraft.com
@ 2018-03-31 18:51 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2018-03-31 18:51 UTC (permalink / raw)
To: buildroot
Hello Charles,
On Sun, 11 Mar 2018 15:17:39 -0700, charles.hardin at storagecraft.com
wrote:
> -DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
> -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
> +DOCKER_CONTAINERD_VERSION = v1.0.1
> +DOCKET_CONTAINERD_COMMIT = 9b55aab90508bd389d7654c4baf173a981477d55
Do we still need the DOCKET_CONTAINERD_COMMIT variable ?
> +DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
> DOCKER_CONTAINERD_LICENSE = Apache-2.0
> DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
>
> @@ -18,15 +19,25 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
> GOPATH="$(DOCKER_CONTAINERD_GOPATH)"
>
> DOCKER_CONTAINERD_GLDFLAGS = \
> - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
> + -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
> +
> +DOCKER_CONTAINERD_BUILD_TAGS =
> +
> +# XXX - Reusing the "docker-engine" config for now
What does that mean ?
> +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y)
> +DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs
> +else
> +DOCKER_CONTAINERD_BUILD_TAGS = no_btrfs
> +endif
> +
>
> ifeq ($(BR2_STATIC_LIBS),y)
> DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static'
> endif
>
> define DOCKER_CONTAINERD_CONFIGURE_CMDS
> - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker
> - ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd
> + mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd
> + ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd
> mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers
> ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc
> endef
> @@ -34,7 +45,9 @@ endef
> define DOCKER_CONTAINERD_BUILD_CMDS
> $(foreach d,ctr containerd containerd-shim,\
> cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \
> - -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep))
> + -tags "$(DOCKER_CONTAINERD_BUILD_TAGS)" \
> + -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" \
> + github.com/containerd/containerd/cmd/$(d)$(sep))
> endef
All of this no longer applies really well on the current
docker-containerd, which has been converted to the golang-package
infrastructure.
Could you respin your patch series, rebased on master, where
docker-containerd, docker-engine and runc have been converted to the
golang-package infrastructure ?
Thanks a lot!
Thomas Petazzoni
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-31 18:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-11 22:17 [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce charles.hardin at storagecraft.com
2018-03-11 22:17 ` [Buildroot] [PATCH v2 3/3] runc: bump to v1.0.0-rc5 charles.hardin at storagecraft.com
2018-03-31 18:51 ` [Buildroot] [PATCH v2 1/3] docker-containerd: bump to version 1.0.1 Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox