From patchwork Thu Mar 1 07:20:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879602 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=paral.in 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="WpNCFoch"; dkim-atps=neutral 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 3zsPCC4CPZz9s1q for ; Thu, 1 Mar 2018 18:27:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 298752280B; Thu, 1 Mar 2018 07:27:17 +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 6KXjINwZiQIF; Thu, 1 Mar 2018 07:27:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2025122151; Thu, 1 Mar 2018 07:27:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2668E1C4377 for ; Thu, 1 Mar 2018 07:27:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 230C585765 for ; Thu, 1 Mar 2018 07:27:12 +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 1gxemnTXWakJ for ; Thu, 1 Mar 2018 07:27:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E73FE8574C for ; Thu, 1 Mar 2018 07:27:10 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id v111so4974071wrb.3 for ; Wed, 28 Feb 2018 23:27:10 -0800 (PST) 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=njmQMR4qVo5zYVlrmAENB4TyedNXzFK3hxSRvaICzC8=; b=WpNCFochGhrx92kYMthNOWx1BvQeT9d92xQB+Oilg9H3deQoJ+jZ+BNKWrlbSYTzXh OtSsUl+DFW5oqdIXnF4/qFhluWlGZvLZtzsCNgs08rjHGpb6i8YCZDlV3DKMJFIe2/CL SHoj34K0BrVpNmxyQK5USC1cJCff1oqcTJRuEw7UFHQX7wGf540RyQLkM6k5xik6mfaj GVo2yK5F6XdXsywPP+wvj0LoYpcy+kcP5bNQ6WPBwwAp68vr5W+JWCOkefYv7/YvnSWB 7tR6nMFEDczswwtcL/6xOtjH2rzzCrS6/86C3zf+R+nrYBDACymW0g1LaeRpE7g9oKi1 EjCg== 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=njmQMR4qVo5zYVlrmAENB4TyedNXzFK3hxSRvaICzC8=; b=Tpw0fSeNywjno+kcgrmo5tQ0/JGXLHOPCU9lUJuONxdX+Nbj9qLY7dB/owOeRmTpL4 zHPd8sGFIFF56oDZa0r2/zblWXS49l+vZs21ht/HLdtbISIk9ziUIr+99nUTL7mQdRBH aeMyjr11eqjrO+M/EIzYpaY2ntCXPG0UACWazhaeEfAh+N3RItdZyDJjCMfxJQyfR5/Z VzU4fqa++VtpJJYsZzqcYsj8UqUb0t1lrUOXz4/iVenVFj2D3K1QGgMmmO0G85+4n2IQ +M0GiF5H7uNqUpvaxEr22URhTTjksJDn29BGrROuhPzfEbnSyXAMpRdz+0x+PJWz7qSf /a5w== X-Gm-Message-State: APf1xPB71RXubhnTGEZpLDBoMNTrBE4S218KVsvntU+8fxGYqLG3H5Ve wqA7Yx7xVHrDcMP7yiv4YO5j1fj6 X-Google-Smtp-Source: AG47ELtIiop9Ip3QvWyMqVvet8eQxb/vftfEZPA5dBjP6f1sSW6L6F1D1oo08e2E13h+aDjY5osl3w== X-Received: by 10.223.199.207 with SMTP id y15mr784815wrg.158.1519888841645; Wed, 28 Feb 2018 23:20:41 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:41 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:12 -0500 Message-Id: <20180301072012.25884-10-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180301072012.25884-1-christian@paral.in> References: <20180301072012.25884-1-christian@paral.in> Subject: [Buildroot] [PATCH v2 9/9] docker-engine: bump to v18.03.0-ce-rc1 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: Thomas Petazzoni , hamilton@aperturerobotics.com, Christian Stewart , "Yann E . MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-engine to v18.03.0-ce-rc1 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 codebase lives 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 the entire docker/cli and moby/moby repositories are copied 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. Signed-off-by: Christian Stewart --- Changes since initial series: - Upgrade to 2018.03-ce-rc1 due to critical bugs in 2018.02. Recommended merge to next branch. --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 48 +++++++++++++++++++------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c0ed338a5..add0b89d39 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 45cda237a2eea4f0415bfb1f755ba64724833ac026328b765ee82aedfcfa36f3 docker-engine-v18.03.0-ce-rc1.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a2776ed78c..f9cb4b8879 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,9 +4,8 @@ # ################################################################################ -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.03.0-ce-rc1 +DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE @@ -19,37 +18,43 @@ 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' +DOCKER_ENGINE_BUILD_TAGS += static_build else ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y) DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static' 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 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 +88,11 @@ 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) && \ - GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ + 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 && \ 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 +101,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 +118,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) \ + -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), \