From patchwork Sun Mar 11 22:17:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 884295 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=storagecraft.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zzwVS6CSRz9sSV for ; Mon, 12 Mar 2018 09:18:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2DB6F22164; Sun, 11 Mar 2018 22:18:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rVUB8ya4GNRf; Sun, 11 Mar 2018 22:18:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8C37D22229; Sun, 11 Mar 2018 22:18:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 720AA1C220E for ; Sun, 11 Mar 2018 22:18:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6D03022164 for ; Sun, 11 Mar 2018 22:18:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TCmR7YtjiLrH for ; Sun, 11 Mar 2018 22:18:00 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-103.mimecast.com (us-smtp-delivery-103.mimecast.com [63.128.21.103]) by silver.osuosl.org (Postfix) with ESMTPS id C7D1E22229 for ; Sun, 11 Mar 2018 22:17:59 +0000 (UTC) Received: from STC-EXCH.stc.local (autodiscover.storagecraft.co.jp [198.135.233.15]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-64-efu4Gs9VPlOZhHFK7eDCCw-1; Sun, 11 Mar 2018 18:17:57 -0400 Received: from localhost.localdomain (50.1.97.2) by webmail.storagecraft.com (10.1.0.30) with Microsoft SMTP Server id 14.3.382.0; Sun, 11 Mar 2018 16:17:56 -0600 From: To: Date: Sun, 11 Mar 2018 15:17:40 -0700 Message-ID: <20180311221741.11346-2-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180311221741.11346-1-charles.hardin@storagecraft.com> References: <20180311221741.11346-1-charles.hardin@storagecraft.com> MIME-Version: 1.0 X-MC-Unique: efu4Gs9VPlOZhHFK7eDCCw-1 Subject: [Buildroot] [PATCH v2 2/3] docker-engine: bump to version 17.12.1-ce X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin Signed-off-by: Charles Hardin --- 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