From patchwork Thu Mar 1 07:20:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879592 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.133; helo=hemlock.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="P4T8EH4b"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsP9N4mv3z9s12 for ; Thu, 1 Mar 2018 18:25:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 72D7E89C45; Thu, 1 Mar 2018 07:25:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rJSMXXyRxsjN; Thu, 1 Mar 2018 07:25:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B799E89C3F; Thu, 1 Mar 2018 07:25:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0FA0E1C4377 for ; Thu, 1 Mar 2018 07:25:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C29A886E9 for ; Thu, 1 Mar 2018 07:25:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AqONjO+c7lkU for ; Thu, 1 Mar 2018 07:25:37 +0000 (UTC) X-Greylist: delayed 00:05:14 by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 90486886DF for ; Thu, 1 Mar 2018 07:25:37 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id o76so4961595wrb.7 for ; Wed, 28 Feb 2018 23:25:37 -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=ACR1nqZ0MBDh41uFfcyNs/kRMUpUCD37fBN2L0QOo6U=; b=P4T8EH4bMTfx5ylbQLyZJEvRuOHceu8L+9GQ1xdjAlaEMpBVVKgXEvcUtuwpKmUB2Z rGuS8MMo5CDRaW4nLglADnz7M5x+4Xuq+0smpNFamuvBXHERSqH1IOhXaKfXm+cw1xB3 YgC1Un9vNGBK4gaSjpVDsACK2jyERI25J77l2TCYnbZxWU7ByPQ38oC2LreyaGAyOfqN 5FfWgSRyCV9a9zmzb1Q1TUW2PO7HMnFeTPF5KVYkwY7Hi1c7imrHpSuNKOj56b/uucdt uBuwCePlvjIkhijocJxBZEwdQ/RWrK/x9AxZ2r/feZKDcgbjxbgTwfcYQdmhesemuZxm 9QbA== 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=ACR1nqZ0MBDh41uFfcyNs/kRMUpUCD37fBN2L0QOo6U=; b=rqRReZbed9bsPPCceCQ+vSB2QZnxGoEyrljOnbmGEEG2CjPE91PxcmT/54QkbikAIz Wa82q6+HIfy2JB62jtH+7GbKCm3tsz3K3yWZmKN44V7gc2Pci1MVUHOaVLpOXmRjYu7m BmBoGkVPg1lS5TFpRm3kiQ+V6kwu4+PkyjxX2TV5jmq7QgzcdDQqNqb2VdwSfim1xTb+ +LPk82ofwc5Fqgx8NOjhKcUbUvUvGyx512ozOHNM7o9w8VqnIgNbRd39ZBiZcrorbWAO y6e5M4rp3KMRFs5LRfGpxZOd8FhqcXiQdX14GPcpgTa2e5oZS2XPYrY3qveKrtVCUng7 e9Eg== X-Gm-Message-State: APf1xPDwts7zmCE4Q0mGHCIjefzD9Bq/yJq86RqMREcJrw3Jnr4/4+XS WTP9YYhSxbp13ziUXVmGMAyCh6yD X-Google-Smtp-Source: AG47ELsChYgtBrQouLufUoYc9HdMISvtgutV5wLCHxbBhRCVQQX2/lCSJD257Q8JlCOIGJV7t8ISBQ== X-Received: by 10.223.157.200 with SMTP id q8mr693702wre.71.1519888821542; Wed, 28 Feb 2018 23:20:21 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:21 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:04 -0500 Message-Id: <20180301072012.25884-2-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 1/9] tini: new package 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" Tini is a minimal init process to act as PID 1 for containers. Tini can be used to satisfy docker-engine's docker-init binary requirement. In many cases docker-init backing processes like Tini must be static, as they are executed inside a container in an unknown environment. This patch adds an option to specifically compile Tini statically, even if the system is compiled dynamically. Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/tini/Config.in | 16 ++++++++++++++++ package/tini/tini.hash | 2 ++ package/tini/tini.mk | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/tini/Config.in create mode 100644 package/tini/tini.hash create mode 100644 package/tini/tini.mk diff --git a/package/Config.in b/package/Config.in index 9cd5d9c087..5bdaa24340 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1921,6 +1921,7 @@ comment "Utilities" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" + source "package/tini/Config.in" source "package/tmux/Config.in" source "package/which/Config.in" source "package/xmlstarlet/Config.in" diff --git a/package/tini/Config.in b/package/tini/Config.in new file mode 100644 index 0000000000..235fc1a8fb --- /dev/null +++ b/package/tini/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_TINI + bool "tini" + help + tini is a simple but valid init binary to + act as PID 1 for containers. + + https://github.com/krallin/tini + +if BR2_PACKAGE_TINI + +config BR2_PACKAGE_TINI_MINIMAL + bool "build minimal variant" + help + Disables argument parsing and verbose output. + +endif diff --git a/package/tini/tini.hash b/package/tini/tini.hash new file mode 100644 index 0000000000..f8c8c2a3aa --- /dev/null +++ b/package/tini/tini.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c2b7fe2fb92e71911d06b7571b53d4e7e8985b34efe2a599670b070b000c8dbe tini-v0.16.1.tar.gz diff --git a/package/tini/tini.mk b/package/tini/tini.mk new file mode 100644 index 0000000000..e345acd7b2 --- /dev/null +++ b/package/tini/tini.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# tini +# +################################################################################ + +TINI_VERSION = v0.16.1 +TINI_SITE = $(call github,krallin,tini,$(TINI_VERSION)) + +TINI_LICENSE = MIT +TINI_LICENSE_FILES = LICENSE + +TINI_CFLAGS = $(TARGET_CFLAGS) -DTINI_VERSION=\"$(TINI_VERSION)\" -DTINI_GIT=\"\" +TINI_CFLAGS += -static + +ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) +TINI_CFLAGS += -DTINI_MINIMAL +endif + +define TINI_CONFIGURE_CMDS + printf "#pragma once\n" > $(@D)/src/tiniConfig.h +endef + +define TINI_BUILD_CMDS + $(TARGET_CC) \ + $(TINI_CFLAGS) \ + -o $(@D)/tini $(@D)/src/tini.c +endef + +define TINI_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/tini $(TARGET_DIR)/usr/bin/tini +endef + +# Tini's CMakeLists.txt is not suitable for Buildroot. +$(eval $(generic-package)) From patchwork Thu Mar 1 07:20:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879596 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.138; helo=whitealder.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="xqqcB79m"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsPB75qGZz9s12 for ; Thu, 1 Mar 2018 18:26:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A25288978; Thu, 1 Mar 2018 07:26:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MYan98bRRo-L; Thu, 1 Mar 2018 07:26:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5096088737; Thu, 1 Mar 2018 07:26:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9E4FA1C4377 for ; Thu, 1 Mar 2018 07:26:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99B19888CA for ; Thu, 1 Mar 2018 07:26:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2w+Wnfwt81dS for ; Thu, 1 Mar 2018 07:26:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id AD999886DF for ; Thu, 1 Mar 2018 07:26:18 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id n7so4969428wrn.5 for ; Wed, 28 Feb 2018 23:26:18 -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=7KbPDXHRwU6eaiCHOX/AkFOjxxzB5tTeAJQX205AIjc=; b=xqqcB79mHGtPc+xcwhNe8ft4csmTrTpKw3vgvypY61N40Gtew5nBRYVBQocm653JIh UEfz+RM5BOnLO0O2OstTxVFKNciiKSO9VA9k66JAQngeiVBUR9MYGkIafGy7/GVR34w7 psY6lO/LAT6eW9ogvHN8yTh+E5z4ENVqQ+AuzoOgFJ7y/UQz1VZ2YyzhhtJ2K0VJHb8h BR4/0h76xCxcUXQLNX4KQFqCW6/t8hM0kF16WrDUAraILKFZpD8z5MErEVkOzWrwtvti GKVtchsFcnUHGiUI2EzAkrm4I1Ajl7unXtsXRjM9ARooN4UMrMpS71Wix/OIYFMCx+Ww SvLw== 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=7KbPDXHRwU6eaiCHOX/AkFOjxxzB5tTeAJQX205AIjc=; b=sSI4jkKvplcUCNr0IvmZ79C2rdzeI/K+wKYJqw4suT8VBA3xK88LtMJg0T8MQhOwGj g00hOhqRUFirj+e+seAm1pA6upI8s2XrR9APL7d1o3SSnL8+zd7OpD6qyF6Y5i8JZgA1 hnchCF7plB2CR5+7FiLliYm4PVMmJ1i9lrvwrd+ZJyqhEtbogpBNbMmaziWXEehjXgXs 5CkAQK0ilc0i4pHXNrGpTrKbp3sRn2p72H/tfnSJFKJKkvrgFdztaUSFvn6uUZWSLu6e J0fyzAY3VUOowUx3a1Axs3XRpIqNtHShngmvgGnD1ORplvTr7GLsYKv9Kz8pJss8HSZx Y0kA== X-Gm-Message-State: APf1xPC0MOSEBzgqfYdlUN3bqnNEAgdaJ/JRUdfkwkbz3Phyzur/XyaK kVD0E+sevT6YaAzFSHxWonXmnyXb X-Google-Smtp-Source: AG47ELu9vVXvssJ/vlu2/Q/r5nN8rrFLeuh6WdL+EUTvY6HKQXWv+/lzUQbXOE5AwsrK79mnZJG0WQ== X-Received: by 10.223.179.17 with SMTP id j17mr692127wrd.223.1519888823602; Wed, 28 Feb 2018 23:20:23 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:23 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:05 -0500 Message-Id: <20180301072012.25884-3-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 2/9] dumb-init: new package 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" dumb-init is a minimal init process to act as PID 1 for containers. dumb-init can be used to satisfy docker-engine's docker-init binary requirement. In many cases docker-init backing processes like dumb-init must be static, as they are executed inside a container in an unknown environment. This patch includes an option to specifically compile dumb-init statically, even if the system is compiled dynamically. Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/dumb-init/Config.in | 7 +++++++ package/dumb-init/dumb-init.hash | 2 ++ package/dumb-init/dumb-init.mk | 24 ++++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/dumb-init/Config.in create mode 100644 package/dumb-init/dumb-init.hash create mode 100644 package/dumb-init/dumb-init.mk diff --git a/package/Config.in b/package/Config.in index 5bdaa24340..dd42db79ec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1906,6 +1906,7 @@ comment "Utilities" source "package/crudini/Config.in" source "package/dialog/Config.in" source "package/dtach/Config.in" + source "package/dumb-init/Config.in" source "package/easy-rsa/Config.in" source "package/file/Config.in" source "package/gnupg/Config.in" diff --git a/package/dumb-init/Config.in b/package/dumb-init/Config.in new file mode 100644 index 0000000000..e817493605 --- /dev/null +++ b/package/dumb-init/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_DUMB_INIT + bool "dumb-init" + help + dumb-init is a simple but valid init binary to + act as PID 1 for containers. + + https://github.com/Yelp/dumb-init diff --git a/package/dumb-init/dumb-init.hash b/package/dumb-init/dumb-init.hash new file mode 100644 index 0000000000..4705ce4368 --- /dev/null +++ b/package/dumb-init/dumb-init.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f v1.2.0.tar.gz diff --git a/package/dumb-init/dumb-init.mk b/package/dumb-init/dumb-init.mk new file mode 100644 index 0000000000..3133384f5a --- /dev/null +++ b/package/dumb-init/dumb-init.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# dumb-init +# +################################################################################ + +DUMB_INIT_VERSION = v1.2.0 +DUMB_INIT_SITE = $(call github,Yelp,dumb-init,$(DUMB_INIT_VERSION)) + +DUMB_INIT_LICENSE = MIT +DUMB_INIT_LICENSE_FILES = LICENSE +DUMB_INIT_CFLAGS += -static + +define DUMB_INIT_BUILD_CMDS + $(TARGET_CC) \ + $(DUMB_INIT_CFLAGS) \ + -o $(@D)/dumb-init $(@D)/dumb-init.c +endef + +define DUMB_INIT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/dumb-init $(TARGET_DIR)/usr/bin/dumb-init +endef + +$(eval $(generic-package)) From patchwork Thu Mar 1 07:20:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879600 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.138; helo=whitealder.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="qwZ/UOjj"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsPC0651Yz9s12 for ; Thu, 1 Mar 2018 18:27:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AB1B9836A3; Thu, 1 Mar 2018 07:27:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zG7vkLDXpJre; Thu, 1 Mar 2018 07:27:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 21DF28261B; Thu, 1 Mar 2018 07:27:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8E2F11C4377 for ; Thu, 1 Mar 2018 07:27:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8732D873DB for ; Thu, 1 Mar 2018 07:27:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 71TdDFDk6iec for ; Thu, 1 Mar 2018 07:27:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by hemlock.osuosl.org (Postfix) with ESMTPS id A73C7872C4 for ; Thu, 1 Mar 2018 07:27:03 +0000 (UTC) Received: by mail-wr0-f176.google.com with SMTP id l43so4987211wrc.2 for ; Wed, 28 Feb 2018 23:27:03 -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=L6MEXkn4EfxnP84XNUgHFLCJIGHoHDuaM6mVnXt6YiQ=; b=qwZ/UOjjIXiJgVa7uDOcidkPVkssLNcrIk1JgXBeZFYh33TL5Qji0odYTwJLtAcIJM WuCtd1zhfCQfWOIHAMf9NxYn+fz9d/JKSkeo54sUmqDoLTWiwHIEMTlQvzT0X2DMTuRo ALgDCVT5x7b9ryyqAy5CtAItdk2tV+vcPfqh6iCjh3G9IjWXQijxw7NUWsvyJr50DUCf WrOHXKWakLI2F8cHMfy1Eic88cVx0nH76TFWeW5fSnDHlzJQVZ5FwMp2jWvVqeZXkNm8 HHzUD26VVvPT7PtwYjiVCm5ry6iEaEsqJOtLDePcrOaA3EwcsekdQ+TBHSp75UuyUkqw VINA== 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=L6MEXkn4EfxnP84XNUgHFLCJIGHoHDuaM6mVnXt6YiQ=; b=NjI+vaHijCfy5890KxcJJusGit3SHl229ON7nnU1aBmBwqpVdVOgxF6Ex5PNhs9Nsd Uvm8V1SJgTYF1O0G1QzjwVA4bOkC70Ise08xiELD+tbZWBKGMpQFWZiu2Uw7MAmbj/cm JeyZgQMtyycx4OQuzh91j1+yXufpuTRSlMn7Kg3piHOmQL6OmgEOTBoP9P5oMw72SRmR XG1lGoKqDtuzEEAC3KwLlgAyBfpSg0twkzVfS+OwN8EV6efBQjIotUob4G4Vyn8ITosp OUQJdFYhm4gA7e9CaMqPRruXXd2bWJI2nQIJ8Hl+6BXgjxcqsGVnEwT3KfGOiUtAGhHz Ti5g== X-Gm-Message-State: APf1xPCKjnjHi/TZV9cNWtEIPNunoF9DJWBthuvL5cULetNlzl/9KuNY vfC0rwmj0HrWoKlHRta4RHZucb9F X-Google-Smtp-Source: AG47ELvvs71k7zqrufW0641Om4ShLzgeoF9mZ/OEohKkQdPIlKpgkDSRejOHtpQVBGBLF7p032s2Hg== X-Received: by 10.223.173.75 with SMTP id p69mr723295wrc.222.1519888825972; Wed, 28 Feb 2018 23:20:25 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:25 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:06 -0500 Message-Id: <20180301072012.25884-4-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 3/9] docker-engine: add support for init processes 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" When a docker container is run with the --init flag, the Docker engine uses the docker-init binary as PID 1 inside the container. This is necessary in may cases to avoid issues with signal handling, zombie processes, and other quirks when running as PID 1. The docker-init binary is backed by tini on default, but optionally can be changed to docker-init by user preference. Furthermore, this patch fixes the following Docker error: dockerd: level=warning msg="failed to retrieve docker-init version" Signed-off-by: Christian Stewart --- package/docker-engine/Config.in | 26 ++++++++++++++++++++++++++ package/docker-engine/docker-engine.mk | 11 +++++++++++ 2 files changed, 37 insertions(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 05670a716e..7d9a87f7bb 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -33,6 +33,32 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT if BR2_PACKAGE_DOCKER_ENGINE_DAEMON +choice + bool "docker-init to use" + default BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI + help + The docker engine uses a minimal init process as PID 1 + inside containers. There are several implementations + of this init process. + +config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI + bool "tini" + select BR2_PACKAGE_TINI + help + Use Tini as the container init process. + + https://github.com/krallin/tini + +config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT + bool "dumb-init" + select BR2_PACKAGE_DUMB_INIT + help + Use dumb-init as the container init process. + + https://github.com/Yelp/dumb-init + +endchoice + config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS bool "btrfs filesystem driver" depends on BR2_USE_MMU # btrfs-progs diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8928f072e7..a2776ed78c 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -50,6 +50,13 @@ endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) DOCKER_ENGINE_BUILD_TAGS += daemon DOCKER_ENGINE_BUILD_TARGETS += dockerd + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y) +DOCKER_ENGINE_INIT = dumb-init +else +DOCKER_ENGINE_INIT = tini +endif + endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) @@ -119,6 +126,10 @@ define DOCKER_ENGINE_INSTALL_TARGET_CMDS $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target) ) + + $(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \ + ln -fs $(DOCKER_ENGINE_INIT) $(TARGET_DIR)/usr/bin/docker-init + ) endef $(eval $(generic-package)) From patchwork Thu Mar 1 07:20:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879595 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="YtPNKJAR"; 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 3zsPB651N1z9s12 for ; Thu, 1 Mar 2018 18:26:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8B5602276F; Thu, 1 Mar 2018 07:26:18 +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 c8k2R32SSy0Y; Thu, 1 Mar 2018 07:26:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 21BC122734; Thu, 1 Mar 2018 07:26:16 +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 264171C4377 for ; Thu, 1 Mar 2018 07:26:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2260A22734 for ; Thu, 1 Mar 2018 07:26:15 +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 ZsdZrUVgthPO for ; Thu, 1 Mar 2018 07:26:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by silver.osuosl.org (Postfix) with ESMTPS id 1276822121 for ; Thu, 1 Mar 2018 07:26:14 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id w77so4964935wrc.6 for ; Wed, 28 Feb 2018 23:26:13 -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=h429ngQoDNpxRud+Lj2KELytQFoweQ9s3tlqydtZXpk=; b=YtPNKJAR0Ry6tT1BYLDGDraynIKjmN+iRuOYpdmL5FmC9B8Gxce0+gxmPTNwXLnjIi grgYMe3+sezvwZXdOb/+wDHuK1ugkYzARNTZfy7hUbalq0IYh18mx8RRI3d+5A+wcqUN gF+QUYN1JV5TTJROVuGgoyyg+ApSPw8G/2magtE3ESSJTunb54t3gO9GbLcIV8Fozmq+ IkNauCoqE0eBOM0/bkvvECCjBjq1f5R8s5rxQdBX7sm2CachgnphoXqsZviij7J6sski SaK/dBE+QUqCkimIb/imdJqjRRnpOdayALbEaqAyCdO2JRK2ZOL/GBoWlTTdg9jNmwy9 S5XQ== 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=h429ngQoDNpxRud+Lj2KELytQFoweQ9s3tlqydtZXpk=; b=T6BeV4ZLeC5j7uIVzdnAw9mF3QVhcdpkjkP++/TJEJHhVaHIa5VArlx99FHLhiW7cV /8guF1JKaDecMm5CpLSZuqsl8nS4rZBFxBG4HIChoeDnMambL+ftlzIgL3wk6dEpVzCQ nQR1X6DQT1Rd7/7/0SqZracg3nghsETVRUDb89wjZehfNFh9ffCYex1L9sdGDuabPXz8 72IOjf2T1956VuDvszp7BYbcvDPL1PcP5EdvbAiev9e3nZzkU0KF9Xu/UIitoLgp89CM NLlGNZFAaU9OQvfpQiOPZpM6Qs6X0sq8+ytlHP8XckhYyd9hNCXdFstOyap0+iaU3o7i My8A== X-Gm-Message-State: APf1xPCvr1Ma6nZ3S2izj6q6g+DDA4sLeva9aeWK+2DEBUedUGNEfQOq psShMCXzbe6o96YLsCf65FavAvNN X-Google-Smtp-Source: AG47ELugKY35Z0YDs1bbuZZrKczASTOXKROrGqbIh+CWnoNJKFKiTID6I7OjDmIR/qwyTiLsSPMO4A== X-Received: by 10.223.136.71 with SMTP id e7mr691454wre.252.1519888828907; Wed, 28 Feb 2018 23:20:28 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:28 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:07 -0500 Message-Id: <20180301072012.25884-5-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 4/9] docker-engine: select static for tini and dumb-init 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" In many cases docker-init backing processes like Tini and dumb-init must be static, as they are executed inside a container in an unknown environment. This patch selects the static compilation options on both packages when used as docker-init backing processes. Signed-off-by: Christian Stewart --- package/docker-engine/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 7d9a87f7bb..47ac7f57a3 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -44,6 +44,7 @@ choice config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI bool "tini" select BR2_PACKAGE_TINI + select BR2_PACKAGE_TINI_STATIC help Use Tini as the container init process. @@ -52,6 +53,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT bool "dumb-init" select BR2_PACKAGE_DUMB_INIT + select BR2_PACKAGE_DUMB_INIT_STATIC help Use dumb-init as the container init process. From patchwork Thu Mar 1 07:20:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879601 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.133; helo=hemlock.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="HQQlg3E0"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsPCB0lmrz9s19 for ; Thu, 1 Mar 2018 18:27:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 367C387C3A; Thu, 1 Mar 2018 07:27:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CPObYsVfhdiN; Thu, 1 Mar 2018 07:27:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5634E873DB; Thu, 1 Mar 2018 07:27:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A44C61C4377 for ; Thu, 1 Mar 2018 07:27:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9DC0C873DB for ; Thu, 1 Mar 2018 07:27:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iqDyb3t+kH4u for ; Thu, 1 Mar 2018 07:27:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by hemlock.osuosl.org (Postfix) with ESMTPS id C4559873D4 for ; Thu, 1 Mar 2018 07:27:12 +0000 (UTC) Received: by mail-wr0-f178.google.com with SMTP id o76so4964988wrb.7 for ; Wed, 28 Feb 2018 23:27:12 -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=x1nGOkeP4pKio4qznQGTljah8zCRRtQydJXCAWZUdQY=; b=HQQlg3E07g1EvnGYhHy5JFtqWIhaXeDhsyfNwml4l76aaApSgxD39VgbohvuLqKBT+ mg+rIhA8JrcZY4jMMamuZlMyXmO/aSO4Bn48YUgNeHPr4QVgbNsJVOZ6x63+va6WTwMu iWFqQS80GsoihYMEKXXzPGLr39k40V81WSTbUiirreg30O0lx2lK+GRavfaFr1wuYOf4 efMLq3Tcbf/2O3d3P/TDgGUmHLQuVu9yr/ZQwqKh3mrEH3PGHfghtYmdHcvayWUaoPlr hAmzCbKvYgSGBfetAw27VYarhmiGSNbtIgZ4SzkcEontOo+wlAcy/cvvpLjQetVBOJfD 1b3w== 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=x1nGOkeP4pKio4qznQGTljah8zCRRtQydJXCAWZUdQY=; b=n7XLXYlcMtmgOcyKoYBLKyytiJpP6kWaRFAO6SUPtdL5k280IgLQpCDG4CSomp+ncj +GaqDM2zAhgczRMskTQNwLsbi/zKT52jSewvH2Z0DjAE3HPoxttdQ5uv90G4/cYdPRrO 23vVnbN+bSjO8EFDNQ5Jx55GAVsicoJ576mCM4AyLDIWzojok80uX9gPFh6IUmgGIfbI 6FzwmK+0W1w6jwuHa7QG1FS9t2iXOBZXJtHpSzzJM8DV+da+XVoanLIKidy1i+azXWt/ 4TPNVmEIh1GpdyaoQxwxNYOfwpVUXhWgNmIQnwDzhhBy08jcpyn90yCF20bVLsjxTEh6 A9hA== X-Gm-Message-State: APf1xPBDbPE2odbAwwMt7aOfPuB3Dlf9DRdW6NCwb647ckljo4KfFk4o rblOcEfja3XWzQenpJMNhjLtlEJ8 X-Google-Smtp-Source: AG47ELs7YPy7rMfmL4X/is4VN33Pjz/AcN/ttneTqtwC+9THVl9pisZs3+rbvw+vLK70E4CDBq+Wvg== X-Received: by 10.223.154.173 with SMTP id a42mr784269wrc.240.1519888831322; Wed, 28 Feb 2018 23:20:31 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:30 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:08 -0500 Message-Id: <20180301072012.25884-6-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 5/9] docker-proxy: new package 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" Add docker-proxy package to Buildroot. Needed by docker-engine at runtime, and previously not included. This leads to the following error when attempting to port-map ports to a container: $ docker run -p 8080:8080 nginx docker: Error response from daemon: driver failed programming external connectivity on endpoint: exec: "docker-proxy": executable file not found in $PATH. Docker expects the docker-proxy binary to exist in the PATH. Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/docker-proxy/Config.in | 18 +++++++++++++ package/docker-proxy/docker-proxy.hash | 2 ++ package/docker-proxy/docker-proxy.mk | 46 ++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 package/docker-proxy/Config.in create mode 100644 package/docker-proxy/docker-proxy.hash create mode 100644 package/docker-proxy/docker-proxy.mk diff --git a/package/Config.in b/package/Config.in index dd42db79ec..181edfb5b7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1947,6 +1947,7 @@ menu "System tools" source "package/debianutils/Config.in" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" + source "package/docker-proxy/Config.in" source "package/dsp-tools/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in new file mode 100644 index 0000000000..4f414b24b1 --- /dev/null +++ b/package/docker-proxy/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Libnetwork is a Container Network Model that provides a + consistent programming interface and the required network + abstractions for applications. + + This package provides docker-proxy, a run-time dependency of Docker. + + https://github.com/docker/libnetwork + +comment "docker-proxy needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash new file mode 100644 index 0000000000..3ec184f54f --- /dev/null +++ b/package/docker-proxy/docker-proxy.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk new file mode 100644 index 0000000000..3bf6546d26 --- /dev/null +++ b/package/docker-proxy/docker-proxy.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# docker-proxy +# +################################################################################ + +DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e +DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) + +DOCKER_PROXY_LICENSE = Apache-2.0 +DOCKER_PROXY_LICENSE_FILES = LICENSE + +DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf + +DOCKER_PROXY_GOPATH = "$(@D)/gopath" +DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + CGO_NO_EMULATION=1 \ + GOBIN="$(@D)/bin" \ + GOPATH="$(DOCKER_PROXY_GOPATH)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + $(TARGET_MAKE_ENV) + +ifeq ($(BR2_STATIC_LIBS),y) +DOCKER_PROXY_GLDFLAGS += -extldflags '-static' +endif + +define DOCKER_PROXY_CONFIGURE_CMDS + mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker + ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork +endef + +define DOCKER_PROXY_BUILD_CMDS + cd $(@D)/gopath/src/github.com/docker/libnetwork; \ + $(DOCKER_PROXY_MAKE_ENV) \ + $(HOST_DIR)/usr/bin/go build -v \ + -o $(@D)/bin/docker-proxy \ + -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \ + github.com/docker/libnetwork/cmd/proxy +endef + +define DOCKER_PROXY_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy +endef + +$(eval $(generic-package)) From patchwork Thu Mar 1 07:20:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879598 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.133; helo=hemlock.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="vmwBlowL"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsPBs0wYgz9s19 for ; Thu, 1 Mar 2018 18:27:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3137089C41; Thu, 1 Mar 2018 07:26:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2fuX7tvgmsOn; Thu, 1 Mar 2018 07:26:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9223A89C46; Thu, 1 Mar 2018 07:26:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 32F221C4377 for ; Thu, 1 Mar 2018 07:26:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D1C288747 for ; Thu, 1 Mar 2018 07:26:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PBazCWgOziHI for ; Thu, 1 Mar 2018 07:26:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id D8A4E888CA for ; Thu, 1 Mar 2018 07:26:54 +0000 (UTC) Received: by mail-wr0-f171.google.com with SMTP id m12so4949329wrm.13 for ; Wed, 28 Feb 2018 23:26:54 -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=G254JHk+9W3GNoUb2tHT/tMHSC1hFafGmtIxVrxd7Bo=; b=vmwBlowLTEpx8iHLPax0KBuK2drUeYdtQFwNlHE4b7satyAQB2jPIyOxUQihf+t8O8 DUf0Hq7zt51cP7fsQ55oo57KW9/cpbl0Ts9SVg1hyCNBarNKe2E52dlsRykaK1uD/qIP SvVSaXB6fw+x1ijb1uyEcE2ZGJdkVVg1A80rS3GxLa2ZxmVOv1z4EiFKkHRFw/Eyb0pW BBYuyV8y6SuAEcGem1qXftKS/vVnOFHzkpJKJshmc8nB8RuNy6uB4tT13chxb8L9FvHG ZlOPqNunZoI8c3c12gfzcOuPTGI1QRi9uVskGsse/xvtmSa9jIZWYfjBU8bygq1WZyvn pPSA== 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=G254JHk+9W3GNoUb2tHT/tMHSC1hFafGmtIxVrxd7Bo=; b=etD0M6km40Jcx1lRv+MHbf33Re0F0T/jLE5A+SFxwCI9YDl/GGokqIpS6o8nowwkbA MDWt2uuQAZ9IrrdEr5jSgKY5//KL0iaKF37ISH95ybX3c4aSUPyi/9AMwc3ZqDE3hBL4 OmyvCUnR0HPhViswkdffFIrX7YLlVBVqbiWweyKqeEUo6ns+mOQbc0O5P+Hbu51W1jRd YHFel3tY77EVr4INLOXNX4jYNDNCks/3EMs+fb8xB/Glpz1dLtPkPkz5k5iCUbDTY3aa DpIfD19IfJfKz7BKJbGyvy0mzO8/OTWeRrBuwDd1RvvAthMMfGzQ3zx8W0xX1nDb4f0z qQ8Q== X-Gm-Message-State: APf1xPAZrOC7Y77Co/PDP5luzmQe4xQw4tramjmUUhJb8OeNMaCD/I8B VeeJGDeVUTK3KjUAf41vRST++8rg X-Google-Smtp-Source: AG47ELtNOO9Se78r1zz9WZdmpSSDtrxHgfncthtBPY4U60IIQUOKR1q098uTZ3c3quJXFMzWe3ro9Q== X-Received: by 10.223.164.215 with SMTP id h23mr715314wrb.38.1519888833852; Wed, 28 Feb 2018 23:20:33 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:33 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:09 -0500 Message-Id: <20180301072012.25884-7-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 6/9] docker-engine: add dependency on docker-proxy 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" docker-proxy is needed by docker-engine at runtime, and was previously not included. This leads to the following error when attempting to port-map ports to a container: $ docker run -p 8080:8080 nginx docker: Error response from daemon: driver failed programming external connectivity on endpoint: exec: "docker-proxy": executable file not found in $PATH. Docker expects the docker-proxy binary to exist in the PATH. Signed-off-by: Christian Stewart --- package/docker-engine/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 47ac7f57a3..05e7aca7ab 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON default y depends on BR2_USE_MMU # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency + select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency help From patchwork Thu Mar 1 07:20:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879597 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.133; helo=hemlock.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="M+jQFKbV"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsPBh0BYcz9s12 for ; Thu, 1 Mar 2018 18:26:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E0C489C45; Thu, 1 Mar 2018 07:26:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SCY9M+MouxHl; Thu, 1 Mar 2018 07:26:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 753A689C3F; Thu, 1 Mar 2018 07:26:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C7B101C4377 for ; Thu, 1 Mar 2018 07:26:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C083689C3F for ; Thu, 1 Mar 2018 07:26:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i7twzK6ZzSIR for ; Thu, 1 Mar 2018 07:26:48 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id E149089C3D for ; Thu, 1 Mar 2018 07:26:47 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t3so9561802wmc.2 for ; Wed, 28 Feb 2018 23:26:47 -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=9cowPEkNdxY+GwQrBYCRrmGGRIacvdJnvZLmp3so7M4=; b=M+jQFKbV8ylZRvzxLsPnqZZ41kwMLirbCAi4ajdF0CSYD8YHtVSX4bCi2kelCO0jT5 l5OXON5pjy+OWh1cQY4xy8L9xhuKWwZ8Na0E2dCD0etl8MHL+h+OD9Yx613ZDfVmz/In ChyAdPQFwKRgbWjdGk5kEcbni0bkPk7twBmZSqxNRUza52lp+BDFQyuPqLOd2V6PbC0N FB4n20TGdsYMoSzKAfZ801W/0nmyqqxV+IAKGNPgEqruIV4yX7RrBljJIw3DxfS8Ys83 jhfX59B9eIyeUiqyvx4Hk5Uc824gZFSdiWkWcqQqTR/1sAcZj9WIS3PcV5DUY6n2EKuU vong== 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=9cowPEkNdxY+GwQrBYCRrmGGRIacvdJnvZLmp3so7M4=; b=EfK71RDrC+Ereu3vBLlFjF2EvPYNR2DiuJ5B0GwE1TZRex2S5CWSNRCf88rbFaBf1b XGFaK1AeuRmHX7edPIwsk4dXFaQmtzbsPuftyk1hNq5RjybQ6owUWTgYFAIiWQ/msLYj /OWiIsnGiW6HGLXScn5PEkGZpzkN37Pj7sZE0vPCLxAp6boUq4OX+/uUDjxHqfH/nUa4 73+6Mb3exkjqNxNUyYQHyTcN2eCUnFW5JEaZqKOUrhz4zsMZ8uwc/N6Jh2M3zM5dV6Id naGg/pFkkQnA6uXN+zWLT336TBdIIE4T17nHUA+kbe5/7qSPT3XKyLAarbSnIP+hfsxl AQjQ== X-Gm-Message-State: AElRT7HfJI0pBmr/xYJt/PZ29tnSoMqQailDp53ZSxB6gzalNjPr38Cj 3rsE7Jz7NfUexR/zGHrTJMyzy6K0 X-Google-Smtp-Source: AG47ELtbwFlwLflnvBs70GD4Fp9Ns/P69M+VCzor+TwOFLuk5h4PHsjJbF3cXZo3jTQqG4IevRYKhw== X-Received: by 10.28.112.15 with SMTP id l15mr829532wmc.119.1519888836493; Wed, 28 Feb 2018 23:20:36 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:36 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:10 -0500 Message-Id: <20180301072012.25884-8-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 7/9] runc: bump to 9f9c96235cc 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 runc to the requisite version for Docker 2018.03. Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 3e188c5c79..f762707869 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz +sha256 df8e7cd1d332d97b468ee455164f3959246bb5fc639dd8042d0db3bded621ad7 runc-6c55f98695e902427906eed2c799e566e3d3dfb5.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index fb3fec20f5..f19fc5f068 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,14 +4,14 @@ # ################################################################################ -RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228 +RUNC_VERSION = 6c55f98695e902427906eed2c799e566e3d3dfb5 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_DEPENDENCIES = host-go -RUNC_GOPATH = "$(@D)/Godeps/_workspace" +RUNC_GOPATH = $(@D)/gopath RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_ENABLED=1 \ GOBIN="$(@D)/bin" \ @@ -23,9 +23,10 @@ RUNC_GLDFLAGS = \ ifeq ($(BR2_STATIC_LIBS),y) RUNC_GLDFLAGS += -extldflags '-static' +RUNC_GOTAGS += static_build endif -RUNC_GOTAGS = cgo static_build +RUNC_GOTAGS = cgo ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_GOTAGS += seccomp @@ -38,9 +39,13 @@ define RUNC_CONFIGURE_CMDS endef define RUNC_BUILD_CMDS - cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ - build -v -o $(@D)/bin/runc \ - -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . + cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc; \ + $(RUNC_MAKE_ENV) \ + $(HOST_DIR)/bin/go build -v -i \ + -o $(@D)/bin/runc \ + -tags "$(RUNC_GOTAGS)" \ + -ldflags "$(RUNC_GLDFLAGS)" \ + ./ endef define RUNC_INSTALL_TARGET_CMDS From patchwork Thu Mar 1 07:20:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 879594 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.138; helo=whitealder.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="g4QEdYAs"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsP9v0V0bz9s19 for ; Thu, 1 Mar 2018 18:26:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 006DB88942; Thu, 1 Mar 2018 07:26:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fp7CoIGHJusD; Thu, 1 Mar 2018 07:26:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 089D48871B; Thu, 1 Mar 2018 07:26:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CCCA51C4377 for ; Thu, 1 Mar 2018 07:26:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C50888871B for ; Thu, 1 Mar 2018 07:26:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uLq1rJab4nXD for ; Thu, 1 Mar 2018 07:26:05 +0000 (UTC) X-Greylist: delayed 00:05:43 by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id DCD2B88719 for ; Thu, 1 Mar 2018 07:26:04 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t3so9558719wmc.2 for ; Wed, 28 Feb 2018 23:26:04 -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=G62vpJgx4ABcCfKSAs7j2WjqImTrder9WajQXK/dqU8=; b=g4QEdYAsOTG425obuz7Dy6wQs7TgDUT6MvvR250wSPVFrbVrLi+jgj7o98kXBFmQ73 ggSiHTxuMMu7/DfYmfZS2vObirVynQbVb3i1OmQ2Yccz/urHlUYrzxRcio4HMAq3ZABx Mno9UlVkPRAVuARP/mIF5JjyGVU9BNtWJS8eOX52u6JJtB1ZawKj8GoKrKDj3U/s2Ihw BKcbFGbChToFXvIlFO0smIyq3pzgo9NAPpKKhQYzzS24vStqICvjBJd4s/z4FwzjNfAj UaODYGTvGOUPyaKN/sAp4eIU7OOHM4dusMGdSWC/1/iM4g+94kY1gEQXeOPQB5vvdBQd hd4A== 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=G62vpJgx4ABcCfKSAs7j2WjqImTrder9WajQXK/dqU8=; b=H0fdZ0WphMhD2zIhutER2X9b8cArgJJ8M46HIQ3LyxdhWoFlPC+vT0DwpJ1buPhuTM Bla4C7BT1Pq0sU/YhXSVknlalCJmMtNQX842r97W8zY4sMaEGDN2UFmIEAuh2hbAA0m1 yZ+wCbZfiPswTeNKX24bg+2QQc60PxlOIFnK0oluiEXLBppLtK0aw/PgNm1HMXsxNjPw SoRghJD+oCvMMR6Iaw6dNB2NbYOVT9zpKULCBZfHAIyfpiCqwT5JeOsmc0/ZtVPcXupo gaBmwFQ0T6w2xIPBb9aDwLuhltZB6KlfXcpeG+Tg2lP9dYEnER1DS4qvUP2adIwOOIxW DBZw== X-Gm-Message-State: AElRT7GtOGB/y1EuIiS3pwiXsLY7LTQTPclb3eTiyVrmRpZnsphG9HTn rs6iJAETlqqZPEBJsjM+/fw/3/QQ X-Google-Smtp-Source: AG47ELtalG9MCD1Hrq0a9zsWUFgykoH+IsE/3wjfZA/v6en75pq8+x2Mz4gBjI/TB2Bzt6lslh4QOQ== X-Received: by 10.28.230.79 with SMTP id d76mr812594wmh.161.1519888839040; Wed, 28 Feb 2018 23:20:39 -0800 (PST) Received: from localhost.localdomain ([138.68.190.162]) by smtp.gmail.com with ESMTPSA id 55sm4709777wrw.87.2018.02.28.23.20.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 23:20:38 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 02:20:11 -0500 Message-Id: <20180301072012.25884-9-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 8/9] docker-containerd: bump to v1.0.2 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-containerd to v1.0.2. This is a requisite bump for the upgrade of docker-engine to 2018.03. Signed-off-by: Christian Stewart --- package/docker-containerd/Config.in | 12 ++++++++ package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 38 ++++++++++++++++++------ 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in index 2f7bf71af1..851345f73e 100644 --- a/package/docker-containerd/Config.in +++ b/package/docker-containerd/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_DOCKER_CONTAINERD https://github.com/docker/containerd +if BR2_PACKAGE_DOCKER_CONTAINERD + +config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS + bool "btrfs snapshot driver" + depends on BR2_USE_MMU # btrfs-progs + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs + select BR2_PACKAGE_BTRFS_PROGS + help + Build the btrfs snapshot driver for containerd. + +endif + comment "docker-containerd needs a toolchain w/ threads" depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 992eb5b01a..bc67fe50dc 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 a31a12846a7a2f697f8fdd82cedd1626fc5f6345e59ae880664196c73e4c2226 docker-containerd-v1.0.2.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index ffbadb0c3f..230307d6b4 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,37 +4,57 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145 -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) +DOCKER_CONTAINERD_VERSION = v1.0.2 +DOCKER_CONTAINERD_COMMIT = cfd04396dc68220d1cecbe686a6cc3aa5ce3667c +DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code DOCKER_CONTAINERD_DEPENDENCIES = host-go -DOCKER_CONTAINERD_GOPATH = "$(@D)/vendor" +DOCKER_CONTAINERD_GOPATH = "$(@D)/gopath" DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_ENABLED=1 \ GOBIN="$(@D)/bin" \ GOPATH="$(DOCKER_CONTAINERD_GOPATH)" DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_COMMIT) + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +DOCKER_CONTAINERD_BUILD_TAGS += seccomp +DOCKER_CONTAINERD_DEPENDENCIES += libseccomp +endif + +ifeq ($(BR2_PACKAGE_DOCKER_CONTAINERD_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' +DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static -fno-PIC' +DOCKER_CONTAINERD_BUILD_TAGS += static_build +DOCKER_CONTAINERD_BUILD_FLAGS += -buildmode pie 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 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)) + cd $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd; \ + $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \ + -v -i -o $(@D)/bin/$(d) \ + -tags "$(DOCKER_CONTAINERD_BUILD_TAGS)" \ + -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" \ + $(DOCKER_CONTAINERD_BUILD_FLAGS) \ + ./cmd/$(d)$(sep) + ) endef define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS 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), \