{"id":815973,"url":"http://patchwork.ozlabs.org/api/patches/815973/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20170920030210.19446-10-christian@paral.in/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920030210.19446-10-christian@paral.in>","list_archive_url":null,"date":"2017-09-20T03:02:10","name":"[9/9] docker-engine: bump to v17.07.0-ce","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"e2d946c1e46b8b9d87eb1fe75e2fb08b9e8adc99","submitter":{"id":66856,"url":"http://patchwork.ozlabs.org/api/people/66856/?format=json","name":"Christian Stewart","email":"christian@paral.in"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170920030210.19446-10-christian@paral.in/mbox/","series":[{"id":4003,"url":"http://patchwork.ozlabs.org/api/series/4003/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=4003","date":"2017-09-20T03:02:02","name":"Upgrading Go to 1.9 and Docker to v2017.07","version":1,"mbox":"http://patchwork.ozlabs.org/series/4003/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815973/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815973/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=paral-in.20150623.gappssmtp.com\n\theader.i=@paral-in.20150623.gappssmtp.com header.b=\"EglzH58g\";\n\tdkim-atps=neutral"],"Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxl7z309Dz9s82\n\tfor ;\n\tWed, 20 Sep 2017 13:09:03 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7CC82873AE;\n\tWed, 20 Sep 2017 03:09:00 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5IVdKLTe58_g; Wed, 20 Sep 2017 03:08:59 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0056887305;\n\tWed, 20 Sep 2017 03:08:58 +0000 (UTC)","from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9189F1C41D9\n\tfor ;\n\tWed, 20 Sep 2017 03:08:57 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8C2662E4C6\n\tfor ;\n\tWed, 20 Sep 2017 03:08:57 +0000 (UTC)","from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id BPfgDSQSg9Iw for ;\n\tWed, 20 Sep 2017 03:08:56 +0000 (UTC)","from mail-wr0-f177.google.com (mail-wr0-f177.google.com\n\t[209.85.128.177])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 6F4EA2DC76\n\tfor ; Wed, 20 Sep 2017 03:08:56 +0000 (UTC)","by mail-wr0-f177.google.com with SMTP id c23so1007330wrg.9\n\tfor ; Tue, 19 Sep 2017 20:08:56 -0700 (PDT)","from ember.home ([2a00:23c1:5b80:3501:e08a:3b55:75b1:41fb])\n\tby smtp.gmail.com with ESMTPSA id\n\ti131sm585601wmf.31.2017.09.19.20.02.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 19 Sep 2017 20:02:26 -0700 (PDT)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"from auto-whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=paral-in.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=kOdi8y/p2sBfnaEfpTKSOOQpOHs3ZgjEwgl2jy3RSyw=;\n\tb=EglzH58gD9P6TUJto0sq8+64ODttLG7bZimE+y5JtK54v/6YBXHBsRPDEa6Y/jZlRQ\n\t7G2FoZ7IhumCesV5NsEMVMypsYx1kJfOro2R5I1oyg6OOLUG5NrAuprlxGZPiyQtcmr0\n\tbBgQWjZjfRSkwyedhOq6/vj8Ehl6gr7kaB2V7VBJNFC1KvWF6huza7mApy9Px78sg6zW\n\tV/KOIRMTSWIRZEvrPq8l7llvXW9LF3AmFuaSdZeXQhv9mb8afcIPji62ppMxYjWVInS2\n\tuJxSQbOGngWyKeFMzdldgrQVkq3yJSSS+WbOWC6sxEU8XEfEPKKEmc+JqFfYBcWLEZia\n\t7q8w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=kOdi8y/p2sBfnaEfpTKSOOQpOHs3ZgjEwgl2jy3RSyw=;\n\tb=VCbkOt2cd61YpKuxxAL+5E4eoiI7sN9h3dam5Yk1MD4PXqaeGwwnFHp9JFnEYyuO9E\n\ttO5AgrvqSVbHS0g5ig6d4nSoYLY7OQH6+eYDkoBBLIY0RGQ4u6AKIMr3UsY+SzV7+2oA\n\t+rV+KEMMp5zvrCL/yWFCou932aH7ukEazSxT8K6SfxZW1hPUisuOX1EYjCllZMaEpiFd\n\taPdDFqY40anrNu1FqM8bBdh9LsLracJjW/Lln8BmV43pzRvjX9Qi5VudQVazvOpZSi6C\n\twHFUiS2PoHJV6SMgU0SlN4wivKiR2d+6QWhKZXMSGiT4PBsqjuCMpm53bKIhxSwEoszD\n\tG3eQ==","X-Gm-Message-State":"AHPjjUionA4yAjK2TEQobc28KnKhm/as1z6Svaeq6XfQzQWuiUk9NGT8\n\tQeMDzPaZoxoN0o5Q8lrEc6HC/Ml/","X-Google-Smtp-Source":"AOwi7QAHiDkMpY4hZ7EKSoGyMk2lrqxb1r6gyRWGKZpWP523kOpcx4YiGTkwaFt2jPq0nrEBo1HuiQ==","X-Received":"by 10.223.176.213 with SMTP id j21mr2893264wra.56.1505876546440; \n\tTue, 19 Sep 2017 20:02:26 -0700 (PDT)","From":"Christian Stewart ","To":"buildroot@buildroot.org","Date":"Wed, 20 Sep 2017 04:02:10 +0100","Message-Id":"<20170920030210.19446-10-christian@paral.in>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170920030210.19446-1-christian@paral.in>","References":"<20170920030210.19446-1-christian@paral.in>","Cc":"thomas.petazzoni@free-electrons.com, geoff@infradead.org,\n\tChristian Stewart ","Subject":"[Buildroot] [PATCH 9/9] 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"This commit bumps docker-engine to v17.07.0-ce.\n\nThe docker-engine repository has now been moved to:\n\n https://github.com/docker/docker-ce\n\nThe CLI and the daemon have been split into separate repositories:\n\n - https://github.com/docker/cli\n - https://github.com/moby/moby\n\nThe daemon is still in the \"moby\" repo, but the import paths in Go are:\n\n github.com/docker/docker\n\nAs before. Presumably, the maintainers will eventually split the engine out\nto a different repository as well.\n\nPlease note that they literally copy the entire docker/cli and moby/moby\nrepositories into the docker-ce repository, as well as all of their\ndependencies in the vendor directories. This means that downloading the\ndocker-ce source tarball contains:\n\n - The cli sources\n - The daemon sources\n - Two copies of all of the dependencies of both\n\nAt the moment this is unavoidable, but does produce a working build.\n\nThe patch was removed, as it is included in this release.\n\nSigned-off-by: Christian Stewart \n---\n package/docker-engine/docker-engine.hash | 3 ++-\n package/docker-engine/docker-engine.mk | 39 ++++++++++++++++++++------------\n 2 files changed, 26 insertions(+), 16 deletions(-)","diff":"diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash\nindex 6c0ed338a5..90708ae972 100644\n--- a/package/docker-engine/docker-engine.hash\n+++ b/package/docker-engine/docker-engine.hash\n@@ -1,2 +1,3 @@\n # Locally calculated\n-sha256\t4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121\tdocker-engine-v17.05.0-ce.tar.gz\n+sha256\te3193118306e0d4dc4b9ad329870633d3a78d80c5f00ca6185e14185e717ca7e\tdocker-engine-v17.07.0-ce.tar.gz\n+\ndiff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk\nindex a2776ed78c..2117272936 100644\n--- a/package/docker-engine/docker-engine.mk\n+++ b/package/docker-engine/docker-engine.mk\n@@ -4,9 +4,9 @@\n #\n ################################################################################\n \n-DOCKER_ENGINE_VERSION = v17.05.0-ce\n-DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f\n-DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))\n+DOCKER_ENGINE_VERSION = v17.07.0-ce\n+DOCKER_ENGINE_COMMIT = 87847530f7176a48348d196f7c23bbd058052af1\n+DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION))\n \n DOCKER_ENGINE_LICENSE = Apache-2.0\n DOCKER_ENGINE_LICENSE_FILES = LICENSE\n@@ -24,7 +24,9 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \\\n \n DOCKER_ENGINE_GLDFLAGS = \\\n \t-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \\\n-\t-X main.Version=$(DOCKER_ENGINE_VERSION)\n+\t-X main.Version=$(DOCKER_ENGINE_VERSION) \\\n+\t-X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \\\n+\t-X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION)\n \n ifeq ($(BR2_STATIC_LIBS),y)\n DOCKER_ENGINE_GLDFLAGS += -extldflags '-static'\n@@ -35,7 +37,10 @@ endif\n endif\n \n DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen\n-DOCKER_ENGINE_BUILD_TARGETS = docker\n+DOCKER_ENGINE_BUILD_TARGETS = cli:docker\n+DOCKER_ENGINE_BUILD_TARGET_PARSE = \\\n+\t\texport targetpkg=$$(echo $(target) | cut -d: -f1); \\\n+\t\texport targetbin=$$(echo $(target) | cut -d: -f2)\n \n ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)\n DOCKER_ENGINE_BUILD_TAGS += seccomp\n@@ -49,7 +54,7 @@ endif\n \n ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)\n DOCKER_ENGINE_BUILD_TAGS += daemon\n-DOCKER_ENGINE_BUILD_TARGETS += dockerd\n+DOCKER_ENGINE_BUILD_TARGETS += docker:dockerd\n \n ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)\n DOCKER_ENGINE_INIT = dumb-init\n@@ -83,10 +88,12 @@ endif\n \n define DOCKER_ENGINE_CONFIGURE_CMDS\n \tmkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker\n-\tln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker\n-\tcd $(@D) && \\\n+\tln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker\n+\tln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli\n+\tcd $(@D)/components/engine && \\\n \t\tGITCOMMIT=\"$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)\" \\\n \t\tBUILDTIME=\"$$(date)\" \\\n+\t\tIAMSTATIC=\"true\" \\\n \t\tVERSION=\"$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))\" \\\n \t\tPKG_CONFIG=\"$(PKG_CONFIG_HOST_BINARY)\" $(TARGET_MAKE_ENV) \\\n \t\tbash ./hack/make/.go-autogen\n@@ -95,9 +102,9 @@ endef\n ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)\n \n define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD\n-\t$(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \\\n+\t$(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.service \\\n \t\t$(TARGET_DIR)/usr/lib/systemd/system/docker.service\n-\t$(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \\\n+\t$(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.socket \\\n \t\t$(TARGET_DIR)/usr/lib/systemd/system/docker.socket\n \tmkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/\n \tln -fs ../../../../usr/lib/systemd/system/docker.service \\\n@@ -112,19 +119,21 @@ endif\n \n define DOCKER_ENGINE_BUILD_CMDS\n \t$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \\\n-\t\tcd $(@D)/gopath/src/github.com/docker/docker; \\\n+\t\t$(DOCKER_ENGINE_BUILD_TARGET_PARSE); \\\n+\t\tcd $(@D)/gopath/src/github.com/docker/$${targetpkg}; \\\n \t\t$(DOCKER_ENGINE_MAKE_ENV) \\\n \t\t$(HOST_DIR)/bin/go build -v \\\n-\t\t\t-o $(@D)/bin/$(target) \\\n+\t\t\t-o $(@D)/bin/$${targetbin} \\\n \t\t\t-tags \"$(DOCKER_ENGINE_BUILD_TAGS)\" \\\n-\t\t\t-ldflags \"$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))\" \\\n-\t\t\tgithub.com/docker/docker/cmd/$(target)\n+\t\t\t-ldflags \"$(DOCKER_ENGINE_GLDFLAGS)\" \\\n+\t\t\t./cmd/$${targetbin}\n \t)\n endef\n \n define DOCKER_ENGINE_INSTALL_TARGET_CMDS\n \t$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \\\n-\t\t$(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)\n+\t\t$(DOCKER_ENGINE_BUILD_TARGET_PARSE); \\\n+\t\t$(INSTALL) -D -m 0755 $(@D)/bin/$${targetbin} $(TARGET_DIR)/usr/bin/$${targetbin}\n \t)\n \n \t$(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \\\n","prefixes":["9/9"]}