From patchwork Thu Oct 19 00:22:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="mZ7kCT1X"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yHVG26HSpz9t6x for ; Thu, 19 Oct 2017 11:30:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 42E6F87ECC; Thu, 19 Oct 2017 00:30:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K7J-c5z2K3Ot; Thu, 19 Oct 2017 00:30:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EAE987E8D; Thu, 19 Oct 2017 00:30:46 +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 ABEA81CE75C for ; Thu, 19 Oct 2017 00:30:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A5931301A3 for ; Thu, 19 Oct 2017 00:30:45 +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 gH1EJqLZ0JZt for ; Thu, 19 Oct 2017 00:30:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by silver.osuosl.org (Postfix) with ESMTPS id 02C3330180 for ; Thu, 19 Oct 2017 00:30:44 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id y15so8390798ita.4 for ; Wed, 18 Oct 2017 17:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qO4sR7GQ7ty5igIjaW9YrWMgvGxG9zBBebeX3zR3zYw=; b=mZ7kCT1XuJ4rPi6rJWeTh5H6uZS4O+EuvsuiNrOagDT3wFDTO0IPaohTwfsiBP/+jE 2fVqqP3vYnwBjZuxIH7wiw34nJu0ivM+BFxhgAZ1eKYCw2zy9bRmMYgZXhJmp3/YbJ1X vulipSqXWJ70c1heKleXzxY/7sUBrEYTsof9i+/gEN03S7OrYaJCMYg6MKyv2th1VA7z h59cvggpowHhkZpFPr73RpoeflowoFdns6ubr0mBK4Ql5CsaEL267k5jhe1ytwQi+wxN eoUPQ4GZTSfgKtnSVGPxDd2eBxyoVmfA8tyd+AwZZd+usZw6vvyuua16OMBDv9SF/4oY fdBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qO4sR7GQ7ty5igIjaW9YrWMgvGxG9zBBebeX3zR3zYw=; b=MGOjb3lalAZNpkvCKZz4TecHCblf+XjUsHQpymPQOEFNoZRuKbyBxnG753CGXFQDHK Z9fg8vNh698e6/16IeOOVR4hzXlj1P6LVslqq+F69exVlMXwPWfqCmqZ35/7fUxSFWEi M1I2guVAN4HjAPt0rBJd12fMLw3vrDcHZhpOWWdJ4Z5oTHw9Qwc4P/mKGfXuPIIrKK3e 1Q+0FlZRRW8Ny8Rtyxh5b4CvndoivrTRTlYteGEuhyzEzB7oPxNm1ygngQ3aFOqcx7cx L13pnT9v4SDCdGwdEzNGFjIFeF0/Uh7WdXTIIfwYN5nD0ZEvcrb0LWd8CJ9OZjtFRtfS MTLg== X-Gm-Message-State: AMCzsaXLujzSpQrafQycpq9CflGRAIncAKKLwBnDssnxuHkO88grPrpe KWqII5Or/PxyNhc5tVJ0iH45/1MX X-Google-Smtp-Source: ABhQp+RQt2qkEz+tpONC/oOi4T39DwV+dcR/2dl5/N13OXjH2heLH8npWMVK5AG0oMYod1uXcUPBjA== X-Received: by 10.36.61.133 with SMTP id n127mr238304itn.106.1508372593037; Wed, 18 Oct 2017 17:23:13 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:12 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:56 -0400 Message-Id: <20171019002257.27646-11-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 11/12] docker-engine: bump to v17.07.0-ce X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-engine to v17.07.0-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 is still 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 they literally copy the entire docker/cli and moby/moby repositories 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. The patch was removed, as it is included in this release. Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 54 ++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c0ed338a5..0d017dc998 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 e3193118306e0d4dc4b9ad329870633d3a78d80c5f00ca6185e14185e717ca7e docker-engine-v17.07.0-ce.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a2776ed78c..0542d73b36 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.07.0-ce +DOCKER_ENGINE_COMMIT = 87847530f7176a48348d196f7c23bbd058052af1 +DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE @@ -19,23 +19,25 @@ 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' -else -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y) -DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static' +DOCKER_ENGINE_BUILD_TAGS += static_build 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 @@ -43,13 +45,13 @@ 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 +85,12 @@ 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/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 && \ 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 @@ -95,9 +99,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 +116,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) \ + $(HOST_DIR)/usr/go build -v \ + -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), \