From patchwork Thu Oct 19 00:22:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="CCnoR6WC"; 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 3yHVFC3lhfz9t6x for ; Thu, 19 Oct 2017 11:30:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E75E8863A; Thu, 19 Oct 2017 00:30:00 +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 UhahwmmYanil; Thu, 19 Oct 2017 00:29:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 593D388637; Thu, 19 Oct 2017 00:29:58 +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 669891CE75C for ; Thu, 19 Oct 2017 00:29:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 420DF88A0E for ; Thu, 19 Oct 2017 00:29:56 +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 F1UeWm5pyFlv for ; Thu, 19 Oct 2017 00:29:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 383B388A0D for ; Thu, 19 Oct 2017 00:29:55 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id p186so8130490ioe.12 for ; Wed, 18 Oct 2017 17:29:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=OIDY5+fulEg6kj2wIbLmeR26CaP0Bq6Dy046B0QDRcM=; b=CCnoR6WCF6K9vdYIvwJNyt/vWC91mhx8zNdd8fqqOd3kI1YA98au8nO3EsGpjGDVik E+uH9R1IJ5pHRdhsO5c9FqP2ld5bjKLhgVmSttlTMRkg9nkuU0OPcxuMpdjJLGzDCXtN q5RapcA2p9zKnzMkhfM4L0NNDvS4LLvEtYXB++84tHS79W2sAO5SW6uSNkN7mo8GY9hY 9K0G+U/DLNh9pQbs1CVON1b24OP3R/LFXKfzM2Xo9NCeKvb8kd/ijvI9Cx24Lx7YzGvI yHsY9iHNy0sIfjF//72HlnU+NZqn+BLt2xWAUJ2wqLNQrJClJbULU004KdSJ5Yw4rOk8 QeMA== 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; bh=OIDY5+fulEg6kj2wIbLmeR26CaP0Bq6Dy046B0QDRcM=; b=j8hWwXnmPoJQCh8na6ctjCdVCT3H+wxsMdCvmNd/VRuiRRhEYNi8ysC/OiT2I5rXvG /+DkG1inabLJ0Xmn1m++X1/Vn4CKhLmcU7o/AHMT6eKtdV4oyf9BwS+czM/V5kETZ43G ZqtxCAKM/3m+2acGF/5ydToma6VH1R+vOJmqLhnyXILVPTzutVORkrKIUtNksnNPurrC W2+IJHyjeLADjllEptOmImX4aXCYMkXKHiaVFr5ATa9ziQixFiuI3W+JqEal3p9lT8A/ EJ4lB+BT2bb5oRACTxz0MwaA9FH58Dh+N6zKLTd14jR7RjiJ085qJ/HyVcpJFn9Ajg4e 9wDw== X-Gm-Message-State: AMCzsaWPHOFUwp0cfacIiPY0/0OrAW/n9PrMPN4n1c6XVsVwxL45Zq+N jRvLHNxcL+VD/Ei3wEDkwU5W9T29 X-Google-Smtp-Source: ABhQp+R6hprnh/ETQxH8vECdoD0nh9mEe9ku785MDBasKattdoK0QOB3jAkS3cDKaz6jWYzU6pOi4w== X-Received: by 10.107.189.129 with SMTP id n123mr446441iof.48.1508372584625; Wed, 18 Oct 2017 17:23:04 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:03 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:46 -0400 Message-Id: <20171019002257.27646-1-christian@paral.in> X-Mailer: git-send-email 2.13.6 Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 01/12] dumb-init: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 | 16 ++++++++++++++++ package/dumb-init/dumb-init.hash | 2 ++ package/dumb-init/dumb-init.mk | 28 ++++++++++++++++++++++++++++ 4 files changed, 47 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 a27f55aec1..c161634daf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1862,6 +1862,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/file/Config.in" source "package/easy-rsa/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..56ca6dc7b1 --- /dev/null +++ b/package/dumb-init/Config.in @@ -0,0 +1,16 @@ +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 + +if BR2_PACKAGE_DUMB_INIT + +config BR2_PACKAGE_DUMB_INIT_STATIC + bool "build static" + help + Enables static compilation for dumb-init. + +endif diff --git a/package/dumb-init/dumb-init.hash b/package/dumb-init/dumb-init.hash new file mode 100644 index 0000000000..e7987b36e2 --- /dev/null +++ b/package/dumb-init/dumb-init.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f dumb-init-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..f2855122fb --- /dev/null +++ b/package/dumb-init/dumb-init.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# 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=$(TARGET_CFLAGS) $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_DUMB_INIT_STATIC),y) +DUMB_INIT_CFLAGS += -static +endif + +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 Oct 19 00:22:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827883 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="t7IKibiz"; 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 3yHVDW3kBmz9t6x for ; Thu, 19 Oct 2017 11:29:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC28F3023C; Thu, 19 Oct 2017 00:29:26 +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 8YKDoapN4kmS; Thu, 19 Oct 2017 00:29:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F3854301A3; Thu, 19 Oct 2017 00:29:24 +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 98E6E1CE75C for ; Thu, 19 Oct 2017 00:29:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 94715301A3 for ; Thu, 19 Oct 2017 00:29:23 +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 vS0TexROJd92 for ; Thu, 19 Oct 2017 00:29:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by silver.osuosl.org (Postfix) with ESMTPS id 0F17930180 for ; Thu, 19 Oct 2017 00:29:22 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id m16so8179119iod.1 for ; Wed, 18 Oct 2017 17:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xOUlJws+MORazqDs/NXkBcMzbGqRHAnTszelC1JElUs=; b=t7IKibizSPxUa5zPai1OGOfmqcDPQBJtKU9dnARMGwZELTbUNRaspgD54dxaq1MkQB yFMLoGAwfZzHCk8KxX3OsiKWHldZrMub66NsGC5VjI9ZVvHNE+57Ak6wV60jWFZ4PV7O cLNR8x+sfB2tu7kZZj6gd0Km8nXDulc06fLrb05oaVXV104vgjJNhS3dDXKlra/bv4KC adED0R1KpiXYpCvsv7WO93yC+JsCyk89JBsGfp3/mbesn22nT7YTNT7JC3mVDM6bFUpn IgesiM2w7Rl40O2JsqbHo9YUW6B86RlkJyM+1pLDnjlZy/fC1XWYoZbIxJec4FNnxPiI VvHA== 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=xOUlJws+MORazqDs/NXkBcMzbGqRHAnTszelC1JElUs=; b=aSPICPwnIIEr01H5f7daM8SZilfSWxhB/I7elOgjwf+G0Yb/ySJW8QF3IYtHEi4BwR pyZmNQ24exunIJkAipgVarKuOKiGoTZwegHFRNrwnvDSWk1HQCsPZiz9mCCQBNoscbB3 JvySScW9Uf9ORf1RVJITvTmxVnnSuK3JQ8MsneYUVtZ2TtikuyZcg3UNSCZOj8dnL30I cOkLlJOBpUeg31f+5b4pI9lLJEv9y7f5CVA2fwXaCBYYzHxpPZWsvYAXYtUyIOo60hgQ MtZ5RQr6OAiqRWHp1IoIWmGCg6vHYHkFifQ6AaddZYdbbtArNtlYDX/bv3PGfE0kcTSa E1/w== X-Gm-Message-State: AMCzsaVxqhjFg+64O15LIXAegG5S/fikOaGARRqtVuvjb91p29vY+KFn EkMn1K8xQhCjIEtrPU9CVE9W2nXX X-Google-Smtp-Source: ABhQp+RoY/p1pF3A2wNsgsWXSCPw+jZumeDwKdUIzx5sh9IcKgxzNCJk9tINUZnHDLg53G5voj/vxg== X-Received: by 10.107.130.193 with SMTP id m62mr339401ioi.273.1508372585732; Wed, 18 Oct 2017 17:23:05 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:04 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:47 -0400 Message-Id: <20171019002257.27646-2-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 02/12] tini: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 | 21 +++++++++++++++++++++ package/tini/tini.hash | 2 ++ package/tini/tini.mk | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 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 c161634daf..f8f9f39167 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1878,6 +1878,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..323b9d17a1 --- /dev/null +++ b/package/tini/Config.in @@ -0,0 +1,21 @@ +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. + +config BR2_PACKAGE_TINI_STATIC + bool "build static" + help + Enables static compilation for tini. + +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..a43f3f0162 --- /dev/null +++ b/package/tini/tini.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# 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=\"\" + +ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) +TINI_CFLAGS += -DTINI_MINIMAL +endif + +ifeq ($(BR2_PACKAGE_TINI_STATIC),y) +TINI_CFLAGS += -static +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) +TINI_CFLAGS += -fstack-protector --param=ssp-buffer-size=4 +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 Oct 19 00:22:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="Rf31/Wfe"; 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 3yHVGR3ZZFz9t6x for ; Thu, 19 Oct 2017 11:31:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 91CAA88A56; Thu, 19 Oct 2017 00:31:09 +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 aVG73mghOQIt; Thu, 19 Oct 2017 00:31:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 71225889EF; Thu, 19 Oct 2017 00:31:07 +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 B5D0C1CE75C for ; Thu, 19 Oct 2017 00:31:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B04C787E8D for ; Thu, 19 Oct 2017 00:31:06 +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 3zPbH8_LPGcV for ; Thu, 19 Oct 2017 00:31:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1C53487894 for ; Thu, 19 Oct 2017 00:31:06 +0000 (UTC) Received: by mail-io0-f170.google.com with SMTP id e89so8145271ioi.11 for ; Wed, 18 Oct 2017 17:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L6MEXkn4EfxnP84XNUgHFLCJIGHoHDuaM6mVnXt6YiQ=; b=Rf31/Wfe1dikCjpClkJx0smk4p29aiBKvNg+eFCkDTh8yFggKKquyJ7VYN6ZeuDyUc vz/a04y4yBKFVcB49ckkWtz21yW7U2MrOOpP622ruuTZ9pkR16TDmTWuxlqNf4HXGbkr +iFwq/5lt4lpVRttvchf0wkD3vAWdPWz7h6rS5fZHcNDreZ59UsFbspdoNpwxBZb/Ick Bsdg6h8nu0KKW3N5EuacfbxZTs4F/uVFEY0YlvY8Qu1DVrDmAEh4H+J7zN+fuocuitDu hdAM8R1rjRSGsxKlFtuTOEyegl3hN4002JnLogaETqC4ZROcc6XQZT3NWmRKWs6gI0AI govQ== 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=nZAmwal1IT+s3Utxs7AZTD55U/3Vlf7ZEfhHGpm65YWF0aT1CkWcmFyWCCoVlW2dlf ksK8sXzx4mH+cZJnmVGlrjp8IgirIAHOTXaBj5i2ohSMUtaU1FEYgxn/O4kcmcQOoe5D fYGek/jlD+m1burf0jHLgbZijZRN3r/dYf/iD/x/HuAnmG8V5MYY6e4nGRZQzjA2L9Q3 AAMzl/KLlddgENCjc/pFqrjAEA+2HxaGuqRUser/w1T652N0OK/nCLRoQt09ykSLTPGq Vmm40K9umARnWbj4B3gHwrfEYD0C0jjx01/HEIXi62pG3AYt1W1z8fER4qjROOIRzp6g usMQ== X-Gm-Message-State: AMCzsaVNUfWNY1tJIM6ABbT4kI7IUUcJMd3dSBZbCbzMQjBrjBsV1rJQ xVr/xWL3SiuXpZqtu0al0xWuONNq X-Google-Smtp-Source: ABhQp+TxdvBZA77/vxyePyysjjtEcprnGBrlWYo6PYM73a8k+qZrLs9WuJzVoXT8dACR6ZFsDxCdKQ== X-Received: by 10.107.222.17 with SMTP id v17mr382381iog.283.1508372586799; Wed, 18 Oct 2017 17:23:06 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:06 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:48 -0400 Message-Id: <20171019002257.27646-3-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 03/12] docker-engine: add support for init processes X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Oct 19 00:22:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827888 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="g1dpjIMT"; 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 3yHVFd2Vq0z9t6x for ; Thu, 19 Oct 2017 11:30:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 69DF888906; Thu, 19 Oct 2017 00:30:26 +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 QTdtPDsAc0j7; Thu, 19 Oct 2017 00:30:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3899C888D1; Thu, 19 Oct 2017 00:30:24 +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 2D9051CE75C for ; Thu, 19 Oct 2017 00:30:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 293D687E93 for ; Thu, 19 Oct 2017 00:30:23 +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 riUB2uQIUPaf for ; Thu, 19 Oct 2017 00:30:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E8DDE87894 for ; Thu, 19 Oct 2017 00:30:21 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id f20so8146731ioj.9 for ; Wed, 18 Oct 2017 17:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h429ngQoDNpxRud+Lj2KELytQFoweQ9s3tlqydtZXpk=; b=g1dpjIMT3gLfHW1bOy/ks7NgRMce7L9HtGRMlzyMGl4Y1oDeGHmTSLSsPX8FGPjiyL hfv6Wrtxy+VTRsWY/XegT91dEPK+pnbjZEGx+qmHB++8ctq2T/yfOsL/PPg94qwII972 PVuRYvADaqFVIDRJo8M1ddM8g4DwZQCBR6AP6MFFCxMekmaJ2kY2t6gAa0xGq/kGaoGr X0yS22TwM+dpem5NKE436lYBUknCt8IBL/6DTRmt7wlusnUEpoDQ1gu+XkjmHrDuCzl2 dOtE5bjFg7PSJgNaCQ7iF+RQt4i9FfOhcGxKJfi0JE9yd8FCtZvROPiZkLkwvNLnRO0T unzg== 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=uKi2p0ADt1srS7dBLvrEMhcE15L1SKKEopn0QlUu/QjFZYdWnHT9KytG0mULIVkS8o i+b8m6Q4T4522u9ewjuBAmesHnKY9vmWBlEfk4t5NTJl9lLT0ANpi5TiGl8KwgFide6O 2VPyPKLtwdniPa/YX5x2TSDgB0g9ous+SLRCn2Ra6wduEeCr02gKfRZVyywl/JxJOtMn blLOnxgnXoFT26W9v0Ts/sykTj88J116m8ZBap3C33OoEaW6jSOy+Z2iPUs9MVnCBRA/ 4pAQ+EkRbxFJ1gGLit9OucHD2I7ORZGysRu2Y7ytHiKhjTlczL8jc321+7c+GHwKcEJq fD/A== X-Gm-Message-State: AMCzsaW0aC2i46KV7w97ChTeRQpRq5A2FOcYch8baGezEdm0trHkSiIa nU3VRBn4lluffLYRIP/WgWHz7ra6 X-Google-Smtp-Source: ABhQp+RcW6560fsoPbD1jjaaYeYJSUf1C4M61YlV7v/swdC3hf6LY2GJkzF6ijKeJge+PYTPVDq97Q== X-Received: by 10.107.201.204 with SMTP id z195mr398676iof.16.1508372587725; Wed, 18 Oct 2017 17:23:07 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:07 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:49 -0400 Message-Id: <20171019002257.27646-4-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 04/12] docker-engine: select static for tini and dumb-init X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Oct 19 00:22:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="Nq3oKltl"; 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 3yHVDz46Y1z9t6x for ; Thu, 19 Oct 2017 11:29:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2D44C88A53; Thu, 19 Oct 2017 00:29:53 +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 FQQpG2V8iNHV; Thu, 19 Oct 2017 00:29:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 28D8D88A04; Thu, 19 Oct 2017 00:29:50 +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 34B401CE75C for ; Thu, 19 Oct 2017 00:29:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2ECC087E18 for ; Thu, 19 Oct 2017 00:29:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6XR8IuPCLQkK for ; Thu, 19 Oct 2017 00:29:48 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f177.google.com (mail-io0-f177.google.com [209.85.223.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 065B187894 for ; Thu, 19 Oct 2017 00:29:48 +0000 (UTC) Received: by mail-io0-f177.google.com with SMTP id p186so8130298ioe.12 for ; Wed, 18 Oct 2017 17:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wNeLd+sJFkmB+aUPjc+hvDYw8Axwts40bgtV/2ZsQcA=; b=Nq3oKltlMkGaRb1ME+PwVPbtX/EKfdEWUMlYdBQKNVEz0vEQFylEviNl7G5qU+Z1v8 dva71ICQJ09Tz5hkcDubDHE0Jwbwg/+KZ9Wv/VpeUq1fitwKPs9V2u70cJXMb2PIDs0l LRdLo+GLydtzdLqzZthCWYjz95rRzyHvGnzJQLa4ofHdOBvkFljQ9NdTWw5GsHxBzJJV 6F4A3q9PK+cb4vBG8Vgkl6pL2xwp79CtU9aZLPFTZ5ujUk4PWrkYmXKZRPIwhe97dBbV tr2r84hUddf5s+5GgRsgKcWXeMFljY9AcaQq0wL+EbHZbz4B/cly0fmx9Tadnb9bgAcs NbRQ== 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=wNeLd+sJFkmB+aUPjc+hvDYw8Axwts40bgtV/2ZsQcA=; b=XHBAlgXWMp06QtL0to/Zlm8pscm+wpTB/6vVQGycrPQgQ1EOOELmYkN6iYqrcYps7F L1A7z+bbZJnpWI/afjtHlat1dNly3G7DlGXPjb3iXHL7lFiBWCczjs+37guvuZm/WY2x h6HOfdnvAnmgq8/qpVxm2FD6yHo5WkVy/BY7HeQdNkKJ/YCTTXAycyK2Aa8vNUSHRlhK 7swJNPXmCeL44jScV6IKRw2e/r1e3NIUtFzm3ELfoaytJeNReDDDq7zM8/3K+ENzBZiI ZJcchEQ2NOSZg/UnEOjMBm6BpjFSaehOscDW8RXN2ZdVt7sMEH00NQrNw1tFjQ/ugGJ2 BBGA== X-Gm-Message-State: AMCzsaXXWriVMSxXuVUjMG6QdsMxrTFvuxMzG6fy8vbcZcbBsijoDrHK G779VbCztwR+SuY84FVs+g6tNpjZ X-Google-Smtp-Source: ABhQp+TYGv0BlMZQI+D5RW8YYB5coP3TNkcsgGg+Q5gc6/tyYOZKbJlGYeLsJPlsr9zVnQITDPwhkw== X-Received: by 10.107.158.75 with SMTP id h72mr399590ioe.256.1508372588457; Wed, 18 Oct 2017 17:23:08 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:07 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:50 -0400 Message-Id: <20171019002257.27646-5-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 05/12] docker-proxy: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 f8f9f39167..909a8c5d1a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1903,6 +1903,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 Oct 19 00:22:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="WNuv5hAR"; 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 3yHVDL1lpKz9t6x for ; Thu, 19 Oct 2017 11:29:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9104588A19; Thu, 19 Oct 2017 00:29:18 +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 lffJR-AQRkxM; Thu, 19 Oct 2017 00:29:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C13F5889EF; Thu, 19 Oct 2017 00:29:16 +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 B82D71CE75C for ; Thu, 19 Oct 2017 00:29:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B36C087E18 for ; Thu, 19 Oct 2017 00:29:15 +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 rUP8l0Ngs91D for ; Thu, 19 Oct 2017 00:29:15 +0000 (UTC) X-Greylist: delayed 00:06:10 by SQLgrey-1.7.6 Received: from mail-io0-f181.google.com (mail-io0-f181.google.com [209.85.223.181]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0FFB387894 for ; Thu, 19 Oct 2017 00:29:15 +0000 (UTC) Received: by mail-io0-f181.google.com with SMTP id f20so8144761ioj.9 for ; Wed, 18 Oct 2017 17:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G254JHk+9W3GNoUb2tHT/tMHSC1hFafGmtIxVrxd7Bo=; b=WNuv5hARsepDQOPFz/8Z8L/Asiuf7zRQXLyWiiynAyRpOQCqYOKK7VgpgEIvCjZUE4 1MLtF5134LSex/PjEKmnmmt38z+kjYvWlZvuoh6RaoHXf4lQOQoVN5SASSBuFt3SMC/2 aNyIgjwWdk7uU201gJ98ip0BuIForA0AdpVvcsA0BgJUSTqeUoy+sywuFOxbdR9f3gxU 211O0S+0uPawPQRiMQWVBQ4BkCc0aRYm0A7ghngfUCbAN1PEP4f090eXnlL18iVk5HkK c0Do0XoxdjSY+exHbuJ6ZzDIFs0KmdVa9rbCDuurEkuCXJ0mz5xctv2RNtlBYzzYFQdE 5hAA== 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=uC/VJXRDT/7EQTYU2cY7z3LUY0liva1e1LwTU4MYXbx76eanM/+e2hJemd/omnYzit sm23yj/QMAmJoR19lMlzMmCxZiqzGk9u8WyY+4VzJM9Cio5RtsuYqJgU/r8gvYdWJdCa 5A9p1QCda83oRezgFLeBMV/fiOteZ5ySJdGaWMT6Fo/B1CAnZMrc/L9xuI8Ogx5iGUU0 kdVyQ0MN3bOrHa+VpqeIHObeNHvcX9OPK4S9KwbEGug4jAJu4ZpAlZ+W51h89IiQOB0V v5w9gnqleLgCt1PdVC3jx54fCFk+HHfeGmIJhNPVIRotQkhUyoKgHcW28OUW6AwSS0Q6 Ljog== X-Gm-Message-State: AMCzsaU7ZX5aSMM6PgNUxdaDUQ7JwQDlyEkmawZqkwA2uYu6Ihja3dsG NI+nCEZxLQav3PEjYMMb+owWxEVP X-Google-Smtp-Source: ABhQp+Tm5NigSAhXNo3qjkCcXKw9zBsKUJVhvXNkBrCePuDdQygXL07Von93Ej979HcyFPU0m54OTw== X-Received: by 10.107.147.131 with SMTP id v125mr424343iod.240.1508372589075; Wed, 18 Oct 2017 17:23:09 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:08 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:51 -0400 Message-Id: <20171019002257.27646-6-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 06/12] docker-engine: add dependency on docker-proxy X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Oct 19 00:22:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="R5cDlhJI"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yHVF80dy2z9t6x for ; Thu, 19 Oct 2017 11:30:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 63E6987EE4; Thu, 19 Oct 2017 00:29:59 +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 KOE3Eg0S0NSX; Thu, 19 Oct 2017 00:29:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6049287E18; Thu, 19 Oct 2017 00:29:54 +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 61E5B1CE75C for ; Thu, 19 Oct 2017 00:29:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5BD6E301A3 for ; Thu, 19 Oct 2017 00:29:50 +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 ueuefrhwyLn3 for ; Thu, 19 Oct 2017 00:29:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by silver.osuosl.org (Postfix) with ESMTPS id 803C830180 for ; Thu, 19 Oct 2017 00:29:49 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id 97so8149039iok.7 for ; Wed, 18 Oct 2017 17:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cWeOGS8oleUnhu/1ZY6vfACp8czGLZOIPZ8JNDDuICQ=; b=R5cDlhJI0osdNpCaWRqSHpAkMnIH0iliNHvj1z/TeljYxsYA5PGaYCFvcdJPrUNj7h c4lmpRONqi//rpkIBQvGPEjftVd3hasAOpqe4ERG61ppkdqEvpz8WeIFG1JhoN6x6y/x DP0wTuoBU2g5XoeWeCHzZhbPwoi4uvkPpgUWfehyj67e4cqlbW/X+eyJtfyjZlDTaEZX jYKjA6AbOUQYsegHoiDplz7mgBky/lK0/nleadn6X5ifdD0aARVQijltxI9u8hvcHPcg Iq9V+nEKKiwiPwU3Bo00sm9iSgiSxb5PUiSaRUtfws91SZ3sI97P/M8I2dyeR0bvICoo UZFQ== 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=cWeOGS8oleUnhu/1ZY6vfACp8czGLZOIPZ8JNDDuICQ=; b=eshfbuT73A5MHV5ebR6pjXDL4MeRUkV7+nuNjgDGEIw/3E+lOoQnS++Od5kTCzbWbG 2Ma3hkGCEQgViG9IxDJYa5gDbXpWaBDANZQcS9NelDbOPMLB4dWJZnVIj3Bb8P4mAptd UEPyMb/0mQCNor48nt77dt16XGMNE+xIdokiPoN37gUMABv1UZHRqTczR5ojC4TeNE4F T6HwLOL7N1p8hqIpQcvc7phYKoiUbSYYPyUvGOgS2TFJ3Fthq83DW46lzGGruDc6SNuw L4MFUEntVMzaGe9F8yz0vx4/rva+/6QzR0tC+T2mdgZ1Y7tJ3yLwqocAKPiKL7WFXWj1 aISQ== X-Gm-Message-State: AMCzsaV6ScugWQfUWNNlIIE6L9CFlguFzDetiATnAoSeGnd7t5AEIhy1 H4uNg/auoFUPRy1OQ+K2DwRKWgyq X-Google-Smtp-Source: ABhQp+SvMvd3foQv3MZZxAItl3RIc+IL3rgri/WsfyMnwI7qnVyPqi8l4WYbvd6OdzWDujXUetBWQQ== X-Received: by 10.107.162.67 with SMTP id l64mr414807ioe.278.1508372589756; Wed, 18 Oct 2017 17:23:09 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:09 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:52 -0400 Message-Id: <20171019002257.27646-7-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 07/12] go: bump version to 1.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bumping Go to 1.9 from 1.7. Go 1.8 comes with significant performance improvements, particularly around ARM: "CPU time required by our benchmark programs was reduced by 20-30% on 32-bit ARM systems." Go 1.9 is required for docker-engine and other Go packages in Buildroot. Signed-off-by: Christian Stewart --- package/go/go.hash | 4 ++-- package/go/go.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 1836af2482..445a0b7c20 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 go1.8.3.src.tar.gz +# From https://golang.org/dl/ +sha256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 go1.9.src.tar.gz diff --git a/package/go/go.mk b/package/go/go.mk index 0781dff035..93e1189c23 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.8.3 +GO_VERSION = 1.9 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From patchwork Thu Oct 19 00:22:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827892 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="mb3S1aBD"; 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 3yHVGh244Tz9t6x for ; Thu, 19 Oct 2017 11:31:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1D61A821AB; Thu, 19 Oct 2017 00:31:21 +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 b0+RSh7jW3pA; Thu, 19 Oct 2017 00:31:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9135F81EBD; Thu, 19 Oct 2017 00:31:18 +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 C39D41CE75E for ; Thu, 19 Oct 2017 00:31:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B991988A04 for ; Thu, 19 Oct 2017 00:31: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 l1TPXqlK-NqY for ; Thu, 19 Oct 2017 00:31:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 42FAC889D4 for ; Thu, 19 Oct 2017 00:31:16 +0000 (UTC) Received: by mail-io0-f196.google.com with SMTP id e89so8145732ioi.11 for ; Wed, 18 Oct 2017 17:31:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CyNLgYRV78uczg95LaBdh4wZz6n5o7SJp6oWm5SPdcw=; b=mb3S1aBDQNCfYR1eYCi6M4CQR7jg28Rbg05y+pSoJvH3Uq7mdR1NNE2CsrTwehFwDJ Un+SzkXJQlYBaYj9kLKvUWYKRKG9uasJ320f6YM0VvUWStw99TL4hZCG3POpLhSFm7pf aKMsOkl3TAVsqaR/Gm91donT6AwcDAcD38bv8BXNMOR/ixTVfFbFiEbdIAqr5fmIekN7 kPlroFyRr08Ph7VZ9Mb23TZFt60QPDXGUH5nek/WV4GLiZvul5ezKyFANbb6d7J84xE+ XuQZBYlcHpr32B2hhGAPM0aa30J2wcgbxFoyo6zG8+hb+sVjCUaoDY+FFUFoLVzO7I8u xMHQ== 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=CyNLgYRV78uczg95LaBdh4wZz6n5o7SJp6oWm5SPdcw=; b=mtMSuGzmc+qGmSB0f2TsX9HHsKYqsN4BqqoQaPR2PJAlZfjxDo8hwnL8N7yw/MzPaa Js+qEEnS66xNrQhZOUgCckov26kO1UrMVMu1OIIIlRXIMCyIGlj+u/dj9qqwsn89waoY KC2mjMnjxQh1NbE7l5af3trfXoRMFqO29uP41ccVnAatp9Cz+GFb+xk4rB6HfFATFSFg uxDiHWjBh3iRQ+aPvynzkrYOHIJcJ8ufTsUT7+wkRRL8xI/4+p2UY4Kp4cLyA2kCb/ff AkkHX9tj7JB97IGWfVJT0lqOaUpYuerIZmuQrp0iXS4SurLFlnAFFKMe6sMZI84uM2PC eHLQ== X-Gm-Message-State: AMCzsaXN0pL2BVrkSCytcMYUgPiQ3gqEptCqa44aOwawHQ5j1gymRH2Z Z+DWMxYDNWKzbXtyfVRaQhSPfMBU X-Google-Smtp-Source: ABhQp+RZvpqeawq5GHphmz5eI/dKXeidEpdGz6MN3FcYyClbfyQ3gUR6NsNbnMHXJt6ubx2sYTEQ7w== X-Received: by 10.107.178.81 with SMTP id b78mr366602iof.235.1508372590632; Wed, 18 Oct 2017 17:23:10 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:10 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:53 -0400 Message-Id: <20171019002257.27646-8-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is a dependency of docker-engine v2017.07.0-ce. Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 3e188c5c79..08e306d0dc 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz +sha256 3ffefd293932d2ad509701878dd7dd6ef498c3667198a33e8e5d5a3cbce0eeaa runc-v1.0.0-rc4.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index fb3fec20f5..0b51e11896 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228 +RUNC_VERSION = v1.0.0-rc4 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE @@ -38,7 +38,8 @@ define RUNC_CONFIGURE_CMDS endef define RUNC_BUILD_CMDS - cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ + cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && \ + $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ build -v -o $(@D)/bin/runc \ -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . endef From patchwork Thu Oct 19 00:22:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="qx8eleY9"; 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 3yHVGV6LKDz9t6x for ; Thu, 19 Oct 2017 11:31:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 43067823EA; Thu, 19 Oct 2017 00:31:13 +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 Ol4dNVTaG9sl; Thu, 19 Oct 2017 00:31:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A06B81DC2; Thu, 19 Oct 2017 00:31:11 +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 0A0E21CE75C for ; Thu, 19 Oct 2017 00:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0480681FCC for ; Thu, 19 Oct 2017 00:31:09 +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 FeReSSZl0S1m for ; Thu, 19 Oct 2017 00:31:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 04A3281D35 for ; Thu, 19 Oct 2017 00:31:08 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id m81so8140042ioi.13 for ; Wed, 18 Oct 2017 17:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kJp9Y2K5HzTSB5F5j4d2Ru4MXBJpMNK4F3LiMs9chJc=; b=qx8eleY9YUOF6k2ElDc6MlAPAb9XL+Ez6/eBYJ5wojzKqVck2Ji1U7z4QlxEb0CgZE SxVcNovbc4kaKLc663oXgAavYuP4n1lECMIBum3ANzJU+qsrLxda38Wd+PXhzbi9/cXE qwtIm88MJGawv5ul8QHrTg7MrbWnTKpVtMkyzZO1jsPuRiXxyt5/ulzkqTy0vcRxH2Fi s64Sw6732sczup2ahhl79lRlZaqUGEA9DMUsu5SA6oHl+uF/0QGPJcc9mnhhi3CN7jpS Zw2STH+geVYJJdk4K39n0VoV1bXlHaWmQTCfAcXDuVhWRZsxXlgjRA7xQTzqDQBql54c 70VA== 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=kJp9Y2K5HzTSB5F5j4d2Ru4MXBJpMNK4F3LiMs9chJc=; b=dE9vDvKllrJl1mrQp/ghLsnHanTLsov0BNbyyRDZj4n7qr0N00czRuzziSveqXDJLg g+JGCgHbnZJMkHK+GrZ0NNYI85gGdYCdAk0DEmbKbP6AgNXAxo9bX+y42M6tPqI0BTen sxNBxkNeMosVEaHbqQvbLmZDrsUlA2DIy1olhp/Cu0gS01+ULLUkkC2GqQZ89zP8L8hE 4sdxxj4nx+z9wjPQkY6VW4qB0ac8WTtmDDmG/LsFk11b+27ZodjwnojUdqE0bebQJGgU +Wc21rU2LFcSECjIOuIsyxuLb5CYD7Vb9Wgb7mhbSJfdLuHpMKB/vqO30BsTyXqPiO1U 1blQ== X-Gm-Message-State: AMCzsaWfKLuVAVwt8ARJCsnCIWEelqUTgG1ydbWxc0oCn48qynBEkyzp MlcYSIG/c7kRNmOyAu+c7/vFv24B X-Google-Smtp-Source: ABhQp+TNdIPhBasXVR+zqUy2I4NucDf6BRcP+00HMBeIhbvN3HNYHJeGh45rugDvOxRcRu/hqsCyFg== X-Received: by 10.107.69.14 with SMTP id s14mr404866ioa.113.1508372591356; Wed, 18 Oct 2017 17:23:11 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:10 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:54 -0400 Message-Id: <20171019002257.27646-9-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 09/12] docker-containerd: bump to 3addd84 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-containerd to: 3addd840653146c90a254301d6c3a663c7fd6429 This is a dependency of docker-engine v2017.07.0-ce. Signed-off-by: Christian Stewart --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 992eb5b01a..cdc3a0b4fb 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 3549e9c4ff1f71c6c9c5932b36b209f9b7ecae3662d251a88ce349853f0249fc docker-containerd-3addd840653146c90a254301d6c3a663c7fd6429.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index ffbadb0c3f..fe30f19817 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145 -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) +DOCKER_CONTAINERD_VERSION = 3addd840653146c90a254301d6c3a663c7fd6429 +DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code @@ -18,22 +18,23 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ GOPATH="$(DOCKER_CONTAINERD_GOPATH)" DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) ifeq ($(BR2_STATIC_LIBS),y) DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' 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 \ + cd $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd; \ + $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/usr/go build \ -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep)) endef From patchwork Thu Oct 19 00:22:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="Om8bFZMt"; 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 3yHVGk1jkqz9t6x for ; Thu, 19 Oct 2017 11:31:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BFCB82F0C; Thu, 19 Oct 2017 00:31:23 +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 ESeaYNJPHeaL; Thu, 19 Oct 2017 00:31:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 97DA38274D; Thu, 19 Oct 2017 00:31:22 +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 10B831CE75C for ; Thu, 19 Oct 2017 00:31:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 039B282C3B for ; Thu, 19 Oct 2017 00:31:21 +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 aRElfgC9mAoy for ; Thu, 19 Oct 2017 00:31:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id C7834821AB for ; Thu, 19 Oct 2017 00:31:18 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id r127so7970551itb.5 for ; Wed, 18 Oct 2017 17:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gXAZDmlwQ/akDRDqIennSON/lHvulohqw4M1kCBzEb4=; b=Om8bFZMtkv15uZKAtYr5ljqYqz8Tdxfx6mrCZzBGVK3TEzfEw3CpDDwzE80AO6+1Gq FKkr418q2Kcvn7eOanrMJmi38rJrHDRUgR5cWQPR1qIlLjnQFy6kc9ulHp8DX+04DLeI Irpgg/+ShDLl2KT1Ynyi2+oZne91UPzxZ0bcpdPl4Dljvgsk9BOMvTA354oXBesFv72r l1TtwWN5fYgzqus5g95d2y3jLHcQYGQLRb9Mhtabu3jTEoZb9nvwuncm73zijU9JRKvd l540HihyF6qrzddIAvAhu6uqvtizwjb9zkF/2fUhW/tezOgBnIxzfUKhVIn3e6+rwONU 4HXw== 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=gXAZDmlwQ/akDRDqIennSON/lHvulohqw4M1kCBzEb4=; b=tPbwUAm8Xf42XpXvbJZIEZT0BlAzpEnPS8J25EMeXwmRmEBTIqJvy2Ub8kbdzPxd2Y Vn0llU62eiw9B4pDG8KnTz/WSWA0fzVMmjBI6TqbZu1s+ryXaMgb+3fYxORPYUm15uZz oNitp09JBqa7wzsljT3aJnnRuc0VM2csF5yR0X9fswoX2eY6xAh2Lm2ofsU54zpkOlBf oITPGJE/xRbqSXFuE3oeRhqZPDNCOA1VCN3/2JNN14yT71S7V4m4eg1J6hDWya2op9P4 PCYzk5UkW95gF+JhreixZ0Y7ggS+j+cj2EjlKtlVv6y8NprCn6Yv08M6oGnbOU3r3IXw WVgg== X-Gm-Message-State: AMCzsaXhFrKUY9Sj7E/nLWUdjR15qsZt5qzgqeLGROphH6GSCP1SYTkz m18f41LUzrvSEYUGUbRvzYLR+n6q X-Google-Smtp-Source: ABhQp+RQfV/LG0RQPm2xSwQJQNgI+KAvo4NJLzwGMnXHxPhJwDrNOsXMRWhErPZy/3C4unu3KIRtdg== X-Received: by 10.36.68.146 with SMTP id o140mr238970ita.74.1508372592109; Wed, 18 Oct 2017 17:23:12 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:11 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:55 -0400 Message-Id: <20171019002257.27646-10-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 10/12] docker-proxy: bump to 9647f99 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-proxy to: 9647f993a81e404639592e8ed73693b48ec09c2e This is a dependency of docker v2017.07: docker/docker-ce#c867dee see components/engine/vendor.conf. Signed-off-by: Christian Stewart --- package/docker-proxy/docker-proxy.hash | 2 +- package/docker-proxy/docker-proxy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash index 3ec184f54f..4e6ba72133 100644 --- a/package/docker-proxy/docker-proxy.hash +++ b/package/docker-proxy/docker-proxy.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz +sha256 dc0aa06e490fcdb799414f339570f85b474500aecb82aeeb3b7c8215d558dbff docker-proxy-9647f993a81e404639592e8ed73693b48ec09c2e.tar.gz diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index 3bf6546d26..330ecd527f 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e +DOCKER_PROXY_VERSION = 9647f993a81e404639592e8ed73693b48ec09c2e DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 From patchwork Thu Oct 19 00:22:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="mZ7kCT1X"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yHVG26HSpz9t6x for ; Thu, 19 Oct 2017 11:30:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 42E6F87ECC; Thu, 19 Oct 2017 00:30:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K7J-c5z2K3Ot; Thu, 19 Oct 2017 00:30:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EAE987E8D; Thu, 19 Oct 2017 00:30:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id ABEA81CE75C for ; Thu, 19 Oct 2017 00:30:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A5931301A3 for ; Thu, 19 Oct 2017 00:30:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gH1EJqLZ0JZt for ; Thu, 19 Oct 2017 00:30:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by silver.osuosl.org (Postfix) with ESMTPS id 02C3330180 for ; Thu, 19 Oct 2017 00:30:44 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id y15so8390798ita.4 for ; Wed, 18 Oct 2017 17:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qO4sR7GQ7ty5igIjaW9YrWMgvGxG9zBBebeX3zR3zYw=; b=mZ7kCT1XuJ4rPi6rJWeTh5H6uZS4O+EuvsuiNrOagDT3wFDTO0IPaohTwfsiBP/+jE 2fVqqP3vYnwBjZuxIH7wiw34nJu0ivM+BFxhgAZ1eKYCw2zy9bRmMYgZXhJmp3/YbJ1X vulipSqXWJ70c1heKleXzxY/7sUBrEYTsof9i+/gEN03S7OrYaJCMYg6MKyv2th1VA7z h59cvggpowHhkZpFPr73RpoeflowoFdns6ubr0mBK4Ql5CsaEL267k5jhe1ytwQi+wxN eoUPQ4GZTSfgKtnSVGPxDd2eBxyoVmfA8tyd+AwZZd+usZw6vvyuua16OMBDv9SF/4oY fdBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qO4sR7GQ7ty5igIjaW9YrWMgvGxG9zBBebeX3zR3zYw=; b=MGOjb3lalAZNpkvCKZz4TecHCblf+XjUsHQpymPQOEFNoZRuKbyBxnG753CGXFQDHK Z9fg8vNh698e6/16IeOOVR4hzXlj1P6LVslqq+F69exVlMXwPWfqCmqZ35/7fUxSFWEi M1I2guVAN4HjAPt0rBJd12fMLw3vrDcHZhpOWWdJ4Z5oTHw9Qwc4P/mKGfXuPIIrKK3e 1Q+0FlZRRW8Ny8Rtyxh5b4CvndoivrTRTlYteGEuhyzEzB7oPxNm1ygngQ3aFOqcx7cx L13pnT9v4SDCdGwdEzNGFjIFeF0/Uh7WdXTIIfwYN5nD0ZEvcrb0LWd8CJ9OZjtFRtfS MTLg== X-Gm-Message-State: AMCzsaXLujzSpQrafQycpq9CflGRAIncAKKLwBnDssnxuHkO88grPrpe KWqII5Or/PxyNhc5tVJ0iH45/1MX X-Google-Smtp-Source: ABhQp+RQt2qkEz+tpONC/oOi4T39DwV+dcR/2dl5/N13OXjH2heLH8npWMVK5AG0oMYod1uXcUPBjA== X-Received: by 10.36.61.133 with SMTP id n127mr238304itn.106.1508372593037; Wed, 18 Oct 2017 17:23:13 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:12 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:56 -0400 Message-Id: <20171019002257.27646-11-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 11/12] docker-engine: bump to v17.07.0-ce X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-engine to v17.07.0-ce. The docker-engine repository has now been moved to: https://github.com/docker/docker-ce The CLI and the daemon have been split into separate repositories: - https://github.com/docker/cli - https://github.com/moby/moby The daemon is still in the "moby" repo, but the import paths in Go are: github.com/docker/docker As before. Presumably, the maintainers will eventually split the engine out to a different repository as well. Please note that they literally copy the entire docker/cli and moby/moby repositories into the docker-ce repository, as well as all of their dependencies in the vendor directories. This means that downloading the docker-ce source tarball contains: - The cli sources - The daemon sources - Two copies of all of the dependencies of both At the moment this is unavoidable, but does produce a working build. The patch was removed, as it is included in this release. Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 54 ++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c0ed338a5..0d017dc998 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 docker-engine-v17.05.0-ce.tar.gz +sha256 e3193118306e0d4dc4b9ad329870633d3a78d80c5f00ca6185e14185e717ca7e docker-engine-v17.07.0-ce.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a2776ed78c..0542d73b36 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,9 +4,9 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v17.05.0-ce -DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f -DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) +DOCKER_ENGINE_VERSION = v17.07.0-ce +DOCKER_ENGINE_COMMIT = 87847530f7176a48348d196f7c23bbd058052af1 +DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE @@ -19,23 +19,25 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_NO_EMULATION=1 \ GOBIN="$(@D)/bin" \ GOPATH="$(DOCKER_ENGINE_GOPATH)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG="$(PKG_CONFIG)" \ $(TARGET_MAKE_ENV) DOCKER_ENGINE_GLDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) + -X main.Version=$(DOCKER_ENGINE_VERSION) \ + -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \ + -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION) + +DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_BUILD_TARGETS = cli:docker +DOCKER_ENGINE_BUILD_TARGET_PARSE = \ + export targetpkg=$$(echo $(target) | cut -d: -f1); \ + export targetbin=$$(echo $(target) | cut -d: -f2) ifeq ($(BR2_STATIC_LIBS),y) DOCKER_ENGINE_GLDFLAGS += -extldflags '-static' -else -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y) -DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static' +DOCKER_ENGINE_BUILD_TAGS += static_build endif -endif - -DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen -DOCKER_ENGINE_BUILD_TARGETS = docker ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_BUILD_TAGS += seccomp @@ -43,13 +45,13 @@ DOCKER_ENGINE_DEPENDENCIES += libseccomp endif ifeq ($(BR2_INIT_SYSTEMD),y) -DOCKER_ENGINE_BUILD_TAGS += journald DOCKER_ENGINE_DEPENDENCIES += systemd +DOCKER_ENGINE_BUILD_TAGS += systemd journald endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) DOCKER_ENGINE_BUILD_TAGS += daemon -DOCKER_ENGINE_BUILD_TARGETS += dockerd +DOCKER_ENGINE_BUILD_TARGETS += docker:dockerd ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y) DOCKER_ENGINE_INIT = dumb-init @@ -83,10 +85,12 @@ endif define DOCKER_ENGINE_CONFIGURE_CMDS mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker - ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker - cd $(@D) && \ + ln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker + ln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli + cd $(@D)/components/engine && \ GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ BUILDTIME="$$(date)" \ + IAMSTATIC="true" \ VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ bash ./hack/make/.go-autogen @@ -95,9 +99,9 @@ endef ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ + $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service - $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ + $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.socket \ $(TARGET_DIR)/usr/lib/systemd/system/docker.socket mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ ln -fs ../../../../usr/lib/systemd/system/docker.service \ @@ -112,19 +116,21 @@ endif define DOCKER_ENGINE_BUILD_CMDS $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - cd $(@D)/gopath/src/github.com/docker/docker; \ + $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \ + cd $(@D)/gopath/src/github.com/docker/$${targetpkg}; \ $(DOCKER_ENGINE_MAKE_ENV) \ - $(HOST_DIR)/bin/go build -v \ - -o $(@D)/bin/$(target) \ + $(HOST_DIR)/usr/go build -v \ + -o $(@D)/bin/$${targetbin} \ -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ - -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \ - github.com/docker/docker/cmd/$(target) + -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \ + ./cmd/$${targetbin} ) endef define DOCKER_ENGINE_INSTALL_TARGET_CMDS $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target) + $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \ + $(INSTALL) -D -m 0755 $(@D)/bin/$${targetbin} $(TARGET_DIR)/usr/bin/$${targetbin} ) $(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \ From patchwork Thu Oct 19 00:22:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 827887 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=paral-in.20150623.gappssmtp.com header.i=@paral-in.20150623.gappssmtp.com header.b="CAa9ntZt"; 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 3yHVFJ00rSz9t7W for ; Thu, 19 Oct 2017 11:30:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0131088A0D; Thu, 19 Oct 2017 00:30:09 +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 O-RV13Rfnlur; Thu, 19 Oct 2017 00:30:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 689BD88A99; Thu, 19 Oct 2017 00:30:03 +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 48DFB1CE75C for ; Thu, 19 Oct 2017 00:30:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 43162889D4 for ; Thu, 19 Oct 2017 00:30:02 +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 A+mQA+t7K2VX for ; Thu, 19 Oct 2017 00:30:01 +0000 (UTC) X-Greylist: delayed 00:06:49 by SQLgrey-1.7.6 Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id B37C388A0D for ; Thu, 19 Oct 2017 00:30:01 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id f187so8423497itb.1 for ; Wed, 18 Oct 2017 17:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pOXkIOnYPxZlG/hU22ZKbGcEEFevTnvHTF/OSZxz9fc=; b=CAa9ntZt7QMAqybcMnkYSSdRWsbV4NRsrYBd+VtIJLG431Hte82IV+4lL+NUD0ducQ cj77I9wLXq4hPLkd/zkliYZVhf41KKaBF7EK6mI65Xbps6Ab/ciNkJ+EeWdomM0lqQVA Jp4nwJixp1F+E/Rd2dNh3XHBvggivn1lJdARdq+8lWevV5LGiF25GK0MzWFVO9q+LHUF B46dIsS++N7LlBFkkAgqS6qauwoVEYdN1MLasXh+XQ87HtLM/AwIUKZGZVjar0sqyHEm g3z6CvUESqud8JQ29VnJaTZQ3iwhA8OWdLcPtjUhQA6+U9UI/J5VNxguGkWOBo/dx0BG pK0Q== 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=pOXkIOnYPxZlG/hU22ZKbGcEEFevTnvHTF/OSZxz9fc=; b=dKxjSCgcJmyO6I5JfuczrZoE7/M7Aw4byI3FSNLcU3VN+wpKjdf0EtiuA5+iuM8HVl cAkXjUrNH+/l/RKpbKvwurBSwoTqmqbtbJ2hDm458VQQnEWlneDaJ9czkLZ7ua3Q1cV/ ZH1CNWo1pG0kHorn7X4FSHo/yeDSY3AKzSKTYVVT//aowSMkVla47kqyiD5jn7fCaP5X clz03q70aQqGE3Gw+wuNgNVOvCMRrQeh7up/E5Vs24gS4dzP5E/68Y61NHRY3uG/Wx2y CNnzfE3IBrsOr76Csq7SZZLVzgaV3WK6SYe6nXoil8b9IpeEy1beSCd37JWK2OzWZQxY ZHSw== X-Gm-Message-State: AMCzsaVKvhesnpKD7H0ibClM3gQuR8d4P9NW8kYFwppiWTy6npHQrsE3 4t8nxnNzkWLXqF84IAm7BdL1cRNm X-Google-Smtp-Source: ABhQp+R1D//Ll76vslc/ilh3Q3ao7v5HZzfANt4BeYi/JbTitaouq1TQdx51ZkMjUFppckwIhxoWyg== X-Received: by 10.36.9.144 with SMTP id 138mr235357itm.106.1508372594054; Wed, 18 Oct 2017 17:23:14 -0700 (PDT) Received: from localhost.localdomain (69-174-167-231.lfytina2.metronetinc.net. [69.174.167.231]) by smtp.gmail.com with ESMTPSA id w136sm89624ita.36.2017.10.18.17.23.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Oct 2017 17:23:13 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 18 Oct 2017 20:22:57 -0400 Message-Id: <20171019002257.27646-12-christian@paral.in> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019002257.27646-1-christian@paral.in> References: <20171019002257.27646-1-christian@paral.in> Cc: Christian Stewart , fontaine.fabrice@gmail.com Subject: [Buildroot] [PATCH 12/12] docker-engine: don't link against libsystemd without systemd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Docker links against libsystemd unconditionally in the latest release. This is entirely unnecessary, and the included patch disables this behavior in the absence of the systemd build tag, which is now set when systemd is enabled in buildroot. This fixes linking errors when building against sysv, and avoids adding a hard dependency on systemd in Docker. Docker-Engine should also use the target pkgconfig, not the host pkgconfig. This is fixed in this patch. Signed-off-by: Christian Stewart --- ...king-against-libsystemd-with-absence-of-s.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch diff --git a/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch b/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch new file mode 100644 index 0000000000..9a8b126d5f --- /dev/null +++ b/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch @@ -0,0 +1,54 @@ +From 56ab23f03df71d6cd084a9f4fd9c382e47b0e26e Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Wed, 20 Sep 2017 18:09:26 +0100 +Subject: [PATCH] disable linking against libsystemd with absence of systemd + build tag + +For some reason, as of this release, Docker now MUST link against libsystemd. + +This is not for a good reason. It's because of two lines in the daemon startup, +which notify the systemd daemon that the daemon is done starting. + +Requiring the presence of an entire systemd library to build Docker is not +suitable for Buildroot. This patch adds a build tag called "systemd," which +when not set, will disable linking against libsystemd. + +Signed-off-by: Christian Stewart +--- + components/engine/cmd/dockerd/daemon_linux.go | 2 +- + components/engine/cmd/dockerd/daemon_linux_nosystemd.go | 13 +++++++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + create mode 100644 components/engine/cmd/dockerd/daemon_linux_nosystemd.go + +diff --git a/components/engine/cmd/dockerd/daemon_linux.go b/components/engine/cmd/dockerd/daemon_linux.go +index a909ee4fbd..89c16bac2f 100644 +--- a/components/engine/cmd/dockerd/daemon_linux.go ++++ b/components/engine/cmd/dockerd/daemon_linux.go +@@ -1,4 +1,4 @@ +-// +build linux ++// +build linux,systemd + + package main + +diff --git a/components/engine/cmd/dockerd/daemon_linux_nosystemd.go b/components/engine/cmd/dockerd/daemon_linux_nosystemd.go +new file mode 100644 +index 0000000000..4f7e92af0f +--- /dev/null ++++ b/components/engine/cmd/dockerd/daemon_linux_nosystemd.go +@@ -0,0 +1,13 @@ ++// +build linux,!systemd ++ ++package main ++ ++// preNotifySystem sends a message to the host when the API is active, but before the daemon is ++func preNotifySystem() { ++ // noop without systemd ++} ++ ++// notifySystem sends a message to the host when the server is ready to be used ++func notifySystem() { ++ // noop without systemd ++} +-- +2.13.5 +