From patchwork Sun Jul 15 01:07:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944018 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="CrS0NsGH"; 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 41SpSY6T0mz9rxs for ; Sun, 15 Jul 2018 11:13:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D29F836E9; Sun, 15 Jul 2018 01:12:57 +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 FIgGaauJ4FiW; Sun, 15 Jul 2018 01:12:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D60A836E3; Sun, 15 Jul 2018 01:12:56 +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 A84C81C002D for ; Sun, 15 Jul 2018 01:12:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A62D2849B7 for ; Sun, 15 Jul 2018 01:12:55 +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 3iQqW5b1kHUD for ; Sun, 15 Jul 2018 01:12:55 +0000 (UTC) X-Greylist: delayed 00:05:17 by SQLgrey-1.7.6 Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DE284849A3 for ; Sun, 15 Jul 2018 01:12:54 +0000 (UTC) Received: by mail-qt0-f171.google.com with SMTP id q12-v6so30235231qtp.6 for ; Sat, 14 Jul 2018 18:12:54 -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=cEmGf4i7zj4xDkO3SGcvdSMzHCphdtBrpaIqdeu6jYU=; b=CrS0NsGHwZBnMdEaPnf86kShDBr1dalE07eU/djNyiJ+SPP+oD1mbsWTZfSK7aYLqa 6b/tlWxMMm2TUHkmzFTzH6upO4fBAZHdKn0SZFxIrT5wRfN/KtnKRzbsUlKJAyLMI7eM yQU7d1B7eyNkU3jtsziM3/j05Ha8MWmAP7Op4MKxowitzV4bttGmad9GDVCl1c/J8Nix eXBgNSF17rrdj+5IKIBDvagE/RnhYp4TYH6d5C7hZlLzWXbkNu0AkygrERrMyerMih8V Y0luxNBJwhLr7+EgVrYeoXC6y3XrzDAbf5JU2FschlUFGRczNUaeZnS5+NWLfDLuUFmE 4+Xg== 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=cEmGf4i7zj4xDkO3SGcvdSMzHCphdtBrpaIqdeu6jYU=; b=Jzyu/sM93Y9pc4gIKKng3JtzvcsSit0d8OpBpl43pulvrsNv5+x0/SwXq9OhtHqcdF gaMiB96t34IYFscJuGMKfU/zmigACpkQ3EyQ8ofd1ypJqUYAhMVBPM91P8vCiFq4ghV8 Rs+vDtAtYztsagh5tHnN+KUWw8QjJEe0/r8CKp+adO2T5b5z5OVoBxQe0byBs66ltL1Z Cy+nbPhf7/QqBKKnHaXxSIKdFvAJldHE+ZAiZyjJOKBCoZVLag10hx9mm3X1cID8ChQr f0klHtTItxaN1O4aR5/1jmiXpugoboEn88l+x6NDrB+L2O0G4pNJwri3ANv8VGButqOt NChA== X-Gm-Message-State: AOUpUlGhvUrji/UPvGF3ZqH8LFoVeIl8sNtBSAcRhvB076ZdS9oHFrsN Kg6Fd6CerPeuc9BzQ7shCSPHuXkz X-Google-Smtp-Source: AAOMgpda1vkuifIRyLR78iE8Kxytu6PEAJr1ckVDrDKdEzMLI0UTfhPNxIaKkOscHg0hos0EsCnx5Q== X-Received: by 2002:ac8:2432:: with SMTP id c47-v6mr10687353qtc.355.1531616868560; Sat, 14 Jul 2018 18:07:48 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:47 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:27 -0700 Message-Id: <20180715010732.21765-7-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH v3 1/6] 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci 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. Signed-off-by: Christian Stewart --- Changes since v2: - Upgraded to v0.17.0 - Added hash for license file --- package/Config.in | 1 + package/tini/Config.in | 16 ++++++++++++++++ package/tini/tini.hash | 3 +++ package/tini/tini.mk | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 55 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 20fe5ad8ff..9d657287cd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1983,6 +1983,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..c4f85c43b0 --- /dev/null +++ b/package/tini/tini.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 5244691718f6856db74dcf6dbb3576a901e737f41412e7895747f0ccb4ccaff0 tini-v0.17.0.tar.gz +sha256 e5f46bca81266bdd511cf08018d66866870531794569c04f9b45f50dd23c28b0 LICENSE diff --git a/package/tini/tini.mk b/package/tini/tini.mk new file mode 100644 index 0000000000..9f9d986745 --- /dev/null +++ b/package/tini/tini.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# tini +# +################################################################################ + +TINI_VERSION = v0.17.0 +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 Sun Jul 15 01:07:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944019 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="F4B8bn22"; 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 41SpSq4zmfz9rxs for ; Sun, 15 Jul 2018 11:13:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7EB6122654; Sun, 15 Jul 2018 01:13:12 +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 QIn3eVXURndT; Sun, 15 Jul 2018 01:13:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 52FAD22646; Sun, 15 Jul 2018 01:13: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 25DB01C002D for ; Sun, 15 Jul 2018 01:13:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 230A3836E5 for ; Sun, 15 Jul 2018 01:13:10 +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 52W-5slKrp1t for ; Sun, 15 Jul 2018 01:13:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f174.google.com (mail-qt0-f174.google.com [209.85.216.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8B533836E4 for ; Sun, 15 Jul 2018 01:13:09 +0000 (UTC) Received: by mail-qt0-f174.google.com with SMTP id e19-v6so16035229qtp.8 for ; Sat, 14 Jul 2018 18:13:09 -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=MNj4qyQd9xx5hS/xQir/KM1eFmm9jaP/XwjxODC2Bso=; b=F4B8bn22PXV9WJfCL0h/zEIF+O/dNlcpRwp8zdzR1PxTppyap1Mc+Il7KsdTRgUQec UZdgcvJmpik2SW2CaVIhpwmxrhzG34x84QBh65NiQ+3tIUOXYCMAM43nCJi/X4arVvMP 75qX9NmI6VsgIIK1A4pZGREWSTh+RetpaXLmwaKNEv3r+mtS37plDAkiG18NCpYWfmdN ANPR3EF+k1zUKSqbXQtpvJK1FR9fkUXq/jrzGNz9L7QerY5R4Npb51EyF0k8STCo/e/Y FrsH3TBGIRzmsWmGL1LZdWUNw+wVznDvvx4QYYE5QAey1o5WUNcFggQuIBgkb1uoI9QN A/7w== 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=MNj4qyQd9xx5hS/xQir/KM1eFmm9jaP/XwjxODC2Bso=; b=ObgxU9Bg+sVWesbBJ4T7VYR3q2AHAJkOFvtph5OX7bZ9paHR420Ma/SLn7jSlfwvnY 3pqUyBlLcLtX3xI/g7KRG8Bjri2SX+r5JPU4vAsMVe6awipovow9TM6ddvTpq6tvaBuR WV+v4GFYf6Ka8596DWwNk+nOrCK+q+Jy1pE8kAnh1mwfDBmNNKl/Qd4eRjbLs4zd5qN/ V+oBO2alX0gGBPRzu3P75lCRzIh7ema0NProTjmC+d/XcZXbye02SmcVranTC4ytPyG6 j9njTaeiok2t3hGOXFnuLrnD8H97SMvju5si4/akA7Qp8g5X3eIqNxWKHwnKDYl/LOVh ZzTg== X-Gm-Message-State: AOUpUlGOdUD2BQj11laOdj+RaE1LzN0n9WhIC0JHy/E4k1GHZgGP3cJF MUuwNOsGnLtJ813UOWNnWk2Zdg6X X-Google-Smtp-Source: AAOMgpc9K9akeqKtEiVmfRLc6NX4Cd7/RdMcYLGk6mVESrsOki9sWyJ5LHceElcTu63azUNY1GbSAA== X-Received: by 2002:ac8:489:: with SMTP id s9-v6mr10456474qtg.173.1531616870093; Sat, 14 Jul 2018 18:07:50 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:49 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:28 -0700 Message-Id: <20180715010732.21765-8-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH v3 2/6] 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci 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. Static compilation is used, as dumb-init will typically be executed inside a container. dumb-init can satisfy docker-engine's docker-init requirement. Signed-off-by: Christian Stewart --- Changes since v1: - Upgraded to v1.2.1 - Added license hash --- package/Config.in | 1 + package/dumb-init/Config.in | 7 +++++++ package/dumb-init/dumb-init.hash | 3 +++ package/dumb-init/dumb-init.mk | 24 ++++++++++++++++++++++++ 4 files changed, 35 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 9d657287cd..2aeb8d0f10 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1968,6 +1968,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..9e74ff5580 --- /dev/null +++ b/package/dumb-init/dumb-init.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 56858088d9d6c911c227d196fcbfca06aff31fbe83e1519f9cabe5cf6f11b242 dumb-init-v1.2.1.tar.gz +sha256 4d74123f166ad8f147e9939bfb451578db84823f22b48fd64b1086d3654a0149 LICENSE diff --git a/package/dumb-init/dumb-init.mk b/package/dumb-init/dumb-init.mk new file mode 100644 index 0000000000..4ebbff1930 --- /dev/null +++ b/package/dumb-init/dumb-init.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# dumb-init +# +################################################################################ + +DUMB_INIT_VERSION = v1.2.1 +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 Sun Jul 15 01:07:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944021 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="G3DawhrE"; 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 41SpTL0Kvsz9rxs for ; Sun, 15 Jul 2018 11:13:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C6592264F; Sun, 15 Jul 2018 01:13:40 +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 x0Ej-ZZc2mob; Sun, 15 Jul 2018 01:13:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id ECAD122646; Sun, 15 Jul 2018 01:13:36 +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 A66611C002D for ; Sun, 15 Jul 2018 01:13:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9DE7183A9C for ; Sun, 15 Jul 2018 01:13:35 +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 GSc8lXvicTtc for ; Sun, 15 Jul 2018 01:13:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0AB9F82C16 for ; Sun, 15 Jul 2018 01:13:35 +0000 (UTC) Received: by mail-qk0-f173.google.com with SMTP id b5-v6so16998768qkg.6 for ; Sat, 14 Jul 2018 18:13:35 -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=jGiW3WjiVfSE/7RKoDlNUb8tyrFWT4H0aMZv69salgk=; b=G3DawhrEKhWX8NL3rn/Hr5h7oa4Q7ARiqaPviILls8z8FcK5AewIApgSeQjY0A5GCK 3VRw3QslZYk3gFOQyKINS/n3hoYTpPHLu36J1GkXWcpe5xhh20i6JUr05vMQrc5EEBT2 IBFDx1fyx8+27KsCWw2bpuCXZjJnRfHt9NwtgQU7gH4/OGOB6zSAh+VrrLJcFMujLcvg h2rREPyPtHr74SkICz/Pg3RXtwKXPpA2WJCoMHWVnPMW9rAP6kkb2gahMO9+jo6Mtb/f l258l9UqwcPRhvvVSrzjmcUWAmv7MjZmDiYa41U9brFPzkOHRQ3r4nje+PTQVEycf3fe vJUw== 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=jGiW3WjiVfSE/7RKoDlNUb8tyrFWT4H0aMZv69salgk=; b=mP41n0lLvVCmOAps9Lsy0NJGY16KXQNBjob26ODXiaUuQ023IMlVmFV8lqSQaYl5Z2 NgL10oAlVlGtcuCWxKSCNm9MmCPRH4yCpQZXFv5h3EDeRNHdi+rgk2W3pxalPqnQZmqV 37LyUiKaU3NQAT6ZRfh6VrlLbf5Qc/P6j3Wggcrmo17p7My+YXSTP8Xfi81gWNfQhcx9 Nl2Lk4N6jVMPuiUiB3aTkASPLa1Qd4lMm1OmeFj1JoNuCZWGGRVCJprFbDwZIbyHFfXO gMM8xqF8giQgZxAarbf/F3v2qiZgFEgFnxeWbixclXwmcl3GxGVY6bo+GoB6q+qyDBew B1Ug== X-Gm-Message-State: AOUpUlF0DLpgwMVTMgxNAzXoGIvJtrwEVGWEX4Rbkelkw0QQ8VDyUWTQ V46+UuIEjrrFsk0Y7GghJQHvsWQK X-Google-Smtp-Source: AAOMgpc2aC1EIPLg4eCPgZJqIm34cXUy44+fhLJJxvroFWa72sZhEI+yquO96kfna8oh5hrl8vUiBg== X-Received: by 2002:a37:9b03:: with SMTP id d3-v6mr9819583qke.122.1531616861713; Sat, 14 Jul 2018 18:07:41 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:40 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:23 -0700 Message-Id: <20180715010732.21765-3-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH 3/6] 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci 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 | 6 ++++++ 2 files changed, 32 insertions(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 8feb11b48c..a76940b6c0 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -34,6 +34,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 ba84b4cf0a..a85f4b5784 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -63,6 +63,12 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y) +DOCKER_ENGINE_INSTALL_BINS += dumb-init +else +DOCKER_ENGINE_INSTALL_BINS += tini +endif + define DOCKER_ENGINE_RUN_AUTOGEN cd $(@D) && \ GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ From patchwork Sun Jul 15 01:07:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944020 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="eSHl2GpE"; 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 41SpTC1pRnz9rxs for ; Sun, 15 Jul 2018 11:13:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 253F7823EC; Sun, 15 Jul 2018 01:13:32 +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 sfKiih7DnShe; Sun, 15 Jul 2018 01:13:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 16665824AE; Sun, 15 Jul 2018 01:13:30 +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 9FBAB1C002D for ; Sun, 15 Jul 2018 01:13:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9DC2C858DE for ; Sun, 15 Jul 2018 01:13:28 +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 5oNIbGP-FVqI for ; Sun, 15 Jul 2018 01:13:26 +0000 (UTC) X-Greylist: delayed 00:05:43 by SQLgrey-1.7.6 Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8A9A6858D3 for ; Sun, 15 Jul 2018 01:13:26 +0000 (UTC) Received: by mail-qk0-f173.google.com with SMTP id u21-v6so19015621qku.2 for ; Sat, 14 Jul 2018 18:13:26 -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=IvQ/2WneThP4M7h5Uvvim5KvJI6mVDCraaQGOs7o1yI=; b=eSHl2GpE8bIxwE95u4PjY7OxVTZw1pg02EmNAb+pT1GDJEi+5/AHT+/vOfy9tt02tD J9wnJZI8Th2kWGP0/6MgzbgogDv3631oUktEGz/CFGLh/Yx3jlCwvZC0Dtu4JvWOeux0 bzYJ0JlAKSZB9maIFUob3m3dYeiFkLR0OIhaWvMX3emFYyJt2uCupn2NRyaTPMFcxEZQ 8GAv2wrPU5lzIbXyT8Pv/UiGe+x4Qttvbwj+fk1JF8luJpkgbqIZcynTDxslZKGLrKs9 zClTV+278T8/rwR5V5Vi+LUHT9vjuYl1DYcpObuodxOcJXFqVBZ1FFw91HoRZmlCgkAf FOXw== 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=IvQ/2WneThP4M7h5Uvvim5KvJI6mVDCraaQGOs7o1yI=; b=jC1n2Hx3jPi8XjeumGG6GUb6BAbMIw1iw6m6tvGaENDhLPw8bXhcZOQO27qJ0XkUCy PsabnysPdxLS60bIixXE+w422L6zp5cxWuVdSreiuk7X+cO4ZjHGv4OTnoTOQlUbYXRs N9ESyRFu2nMv/aEkVcWWIARidbAZ0BX5j/Jy5KVY9Bk5DXR7ESll6s9cCWkUdcuN9uFA pHnWOD6kr7cWu/p3DNqYGFygMEfwJeZ6xCWKnWQYSQJ6qXg8hkww5lIQ2ZCXfmB4Il5C ulwdRIbnXin7RYdpaH9wM1YOtGxhJ/Nrm2Q6niQt7P8qvYfJ4j+C8NBUIHoBl6i04wpt BwYA== X-Gm-Message-State: AOUpUlEbHOy5uf93p43GKNLAUtStnp40iLyRwiA2CyWQfv78pLNQqzaJ wvH+DKOB6uhu5QFpDCz6dmKO9Bal X-Google-Smtp-Source: AAOMgpeIuwiNWC/lxedJx44xkG+ClY3O+Z4v2QoWK+DAbm7L9c0bSnLT1KCtc/pziFEK6TFGZLpaWg== X-Received: by 2002:a37:af42:: with SMTP id y63-v6mr10359046qke.87.1531616863260; Sat, 14 Jul 2018 18:07:43 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:42 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:24 -0700 Message-Id: <20180715010732.21765-4-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH 4/6] runc: bump to 69663f0b 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps runc to the requisite version for Docker 2018.06. Added note about where runc version dependency is declared: RUNC_VERSION = 69663f0bd4b60df09991c08812a60108003fa340 Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 3e188c5c79..d6bdfe24c7 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz +sha256 994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef runc-69663f0bd4b60df09991c08812a60108003fa340.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index f1586f32b2..7f42c962f3 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,8 @@ # ################################################################################ -RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228 +# docker-engine/hack/dockerfile/install/runc.installer:4 RUNC_COMMIT=... +RUNC_VERSION = 69663f0bd4b60df09991c08812a60108003fa340 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From patchwork Sun Jul 15 01:07:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944023 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="vh465BO1"; 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 41SpTv0y79z9rxs for ; Sun, 15 Jul 2018 11:14:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0371222667; Sun, 15 Jul 2018 01:14:09 +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 omjIK3xdVqIA; Sun, 15 Jul 2018 01:14:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7100522646; Sun, 15 Jul 2018 01:14:07 +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 0A3F81C002D for ; Sun, 15 Jul 2018 01:14:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 07C8122646 for ; Sun, 15 Jul 2018 01:14:06 +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 DsO7vU5FVWWN for ; Sun, 15 Jul 2018 01:14:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f172.google.com (mail-qk0-f172.google.com [209.85.220.172]) by silver.osuosl.org (Postfix) with ESMTPS id 6E3D722613 for ; Sun, 15 Jul 2018 01:14:05 +0000 (UTC) Received: by mail-qk0-f172.google.com with SMTP id b66-v6so19003402qkj.1 for ; Sat, 14 Jul 2018 18:14:05 -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=zhXSLF06gdF35rKkPDL2QvsQyQYHEMvMXao/VKgL24w=; b=vh465BO1w/nTY7qCGGh6GcgOQxBheW0vB7SxLzs41vz4fWfkAeQRff/XzF1auDm32C K8SaPMEnRlP2kfbgT9iiOT0sqUNcdzWyZSRQNjdZR1KEt/V6ohWO91Re0e10ky7/O/Ei 2kKEvddmX+yqRxrZEddVJE/sZm8Q9jnygutxKD8EDfr+/NK46DxC0N/FNBGWbE7AcHsK eSfYE92BLLA40B+jPWO/aqJvO0fwg2eihVyL8KnH3hx1/q2MzEAYwSIQMWA3h9hL2tlo inhs7VUvmHTFZFyqA7lIzFCCUvdhOXmZHzytm/xmq/+dYbBpr47OqY18y4YCgQtno9mA +IIA== 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=zhXSLF06gdF35rKkPDL2QvsQyQYHEMvMXao/VKgL24w=; b=X544WwEPLG5i+9VAxvXhuTW8KcarsvLEsSwNjb16WOl8ShjR/dSewGZCKQjTwPtMBg swc2FHZZzvkDFBPeFKzWjIFjo0QXW7TylqRKl+u23U+QjyVnud8Y/GBcgJ4tMqT7AGb2 WzmCa8s+/AJLelG6GdKqH87GhpAMF4C80AuEkRcgWnhCIjKiPAcS0PtELQIFZUGOFDvP 9IB1NqRYRQ3q48RQIHKkX3KkjpdnAJ8Bvfwo8C+xlgz5/mv7wexgreIyEdtzXg4xNrXN 5Ss8JhOeCQI6BY5OWJk9NRG1Rf0fwwxuTWiob9cka2EU6nSep5VPbeGKNtywWcJeULfW TDbg== X-Gm-Message-State: AOUpUlEH89rO/w7b08wnlu5VYFYg6n7wUTfOLCBqlDsZaxkFVLsnyIBU 5JEnJLLjH26M+G/Xdul28nedTeM0 X-Google-Smtp-Source: AAOMgpc7k7t/J20Pph+mWN9zT776lo4PBtGnHXERO2NUlzhNtjmoUuBPmJOUsAGr6QAayIEOlDbT7A== X-Received: by 2002:a37:986:: with SMTP id 128-v6mr9519993qkj.437.1531616864831; Sat, 14 Jul 2018 18:07:44 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:43 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:25 -0700 Message-Id: <20180715010732.21765-5-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH 5/6] docker-containerd: bump to v1.1.1 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps docker-containerd to v1.1.1. This is a requisite bump for the upgrade of docker-engine to 2018.06. Signed-off-by: Christian Stewart --- package/docker-containerd/Config.in | 12 ++++++++++++ package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 18 +++++++++++++++--- 3 files changed, 28 insertions(+), 4 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..6d5ed45589 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 2901e3f6113ea97850ec9ac5640db0273c7f10e887701f7da2cf3ae1a730934e docker-containerd-v1.1.1.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 09e89f1aba..85dd6e1f71 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,8 +4,9 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145 -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) +DOCKER_CONTAINERD_VERSION = v1.1.1 +DOCKER_CONTAINERD_COMMIT = d64c661f1d51c48782c9cec8fda7604785f93587 +DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code @@ -14,10 +15,21 @@ DOCKER_CONTAINERD_WORKSPACE = vendor DOCKER_CONTAINERD_LDFLAGS = \ -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) -DOCKER_CONTAINERD_BUILD_TARGETS = ctr containerd containerd-shim +DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +DOCKER_CONTAINERD_DEPENDENCIES += libseccomp +DOCKER_CONTAINERD_TAGS += seccomp +endif + +ifeq ($(BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS),y) +DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs +else +DOCKER_CONTAINERD_TAGS += no_btrfs +endif + define DOCKER_CONTAINERD_INSTALL_SYMLINKS ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim From patchwork Sun Jul 15 01:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 944025 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="smpoMG4C"; 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 41SpWn3FDyz9rxs for ; Sun, 15 Jul 2018 11:15:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5F80285926; Sun, 15 Jul 2018 01:15:46 +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 Dc8nldiRkB1e; Sun, 15 Jul 2018 01:15:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1B8A583619; Sun, 15 Jul 2018 01:15:44 +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 82E8B1C002D for ; Sun, 15 Jul 2018 01:15:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 80B2F836E6 for ; Sun, 15 Jul 2018 01:15:43 +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 HrvVl1HHhY1S for ; Sun, 15 Jul 2018 01:15:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f170.google.com (mail-qt0-f170.google.com [209.85.216.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id 895B0836E5 for ; Sun, 15 Jul 2018 01:15:42 +0000 (UTC) Received: by mail-qt0-f170.google.com with SMTP id y5-v6so30234905qti.12 for ; Sat, 14 Jul 2018 18:15:42 -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=Q1nSjamYVPn9icPfl5xN47+LXgjvz8nRUKUubFvePNE=; b=smpoMG4CGU+JaICON7FnW8hH/pUgxFnRY820fDL7xbY+8fjQcst9u9NHX1ZqSZTfGy cxHFY4louS7nSZlVt4Oxk+S2Dnqf1onEDuUNBiyXeqChHWcdUG7NdMYLGAnjy3Sor2ki gIU00eHJnIzyFXqUV4O3WKI1audrzhExZLtwoxguODaLG2Ejv6zTb6PcbUGS/opXhR27 9f43o4DLeetgtE3Gw/vyA5a/JkYgxqcpjFP4m+DLQ44FqczLnu4GTZoyxoD8mH4EFcce MOeejLTXeypFgCYuyMENJyDy3HA8SPDzt5tRAwNbWG+engrGWLcC/P0gB2CnunXPPD3f LDIw== 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=Q1nSjamYVPn9icPfl5xN47+LXgjvz8nRUKUubFvePNE=; b=SqIECCmK/OknlKz0/jupbuT5+Ndim9c9AP4z4YVcMbaQEl0AbsaHhKSHI14a8dSQ7B PLdkVN4iJHqRtLH+OX3kKf8rg+cP2s7McxLny6+dixjAqlqvpMof0Qm8/hN2drdMCbK2 BPM2xLFz9J9UAEreduHUoT8/BIpFak1nNXlL5N+swkTkEr8nEu26sr9/BWRPBXZYp/wT +4/iUMKKEy8WoxC4LNY+C3fcaRIUjS9TiehXKVJGqQoC0CQhmQ1ZLwJjwq4GGw8ez8vy XyxUdVAHpnd34wbC7MSakJIHXuB68X+/SLiT7uy9MAdBwbgWdWzZbTLL24XtG6w7Ml2U JViA== X-Gm-Message-State: AOUpUlFqp3iE2vh+hu7E0YGZrWZQSlxwnAtFug4WaLbkZmjuhhJ0KFIs /h+++0vgD94orSZTFIDdX8uvlsM2 X-Google-Smtp-Source: AAOMgpeclg49E+66rvUKLsIjZkiXpKkNo1gzt+2ujN7hJdp2i2ItRlxZcWHjOD9WWRNHt5wgn3Fa4w== X-Received: by 2002:aed:2561:: with SMTP id w30-v6mr10190567qtc.240.1531616866966; Sat, 14 Jul 2018 18:07:46 -0700 (PDT) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id a17-v6sm1867480qkb.62.2018.07.14.18.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jul 2018 18:07:45 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 14 Jul 2018 18:07:26 -0700 Message-Id: <20180715010732.21765-6-christian@paral.in> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180715010732.21765-1-christian@paral.in> References: <20180715010732.21765-1-christian@paral.in> Subject: [Buildroot] [PATCH 6/6] docker-engine: split into docker-{cli, engine}, bump v2018.06-ce-rc3 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: Christian Stewart , Thomas Petazzoni , Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Docker upstream has split the Docker daemon and CLI into separate codebases: - github.com/docker/docker-engine: daemon, remains in docker-engine - github.com/docker/cli: cli, split into docker-cli and selected by engine This commit splits the docker-engine package into docker-engine and docker-cli. Conveniently, the Docker project has begun maintaining two separate release-tagged repositories for the CLI and daemon as of v18.06-ce-rc1. Previous versions were tagged in a common "docker-ce" repository which makes compilation awkward for Buildroot, especially due to some limitations in the new Go package infrastructure. Legacy flags are added to ease the transition: - BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT=y -> BR2_PACKAGE_DOCKER_CLI_STATIC - docker-engine selects docker-cli Docker repositories "engine" and "cli" recently started tagging releases as recent as v18.06-ce-rc1, so we pull the latest tagged release v18.06-ce-rc3 and upgrade to v18.06-ce when it is released. Signed-off-by: Christian Stewart --- Config.in.legacy | 9 +++++++++ package/Config.in | 1 + package/docker-cli/Config.in | 25 +++++++++++++++++++++++++ package/docker-cli/docker-cli.hash | 2 ++ package/docker-cli/docker-cli.mk | 29 +++++++++++++++++++++++++++++ package/docker-engine/Config.in | 7 +------ package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 32 ++++++++++++++------------------ 8 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 package/docker-cli/Config.in create mode 100644 package/docker-cli/docker-cli.hash create mode 100644 package/docker-cli/docker-cli.mk diff --git a/Config.in.legacy b/Config.in.legacy index 9743ebd08f..4cf9d05b9c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -242,6 +242,15 @@ config BR2_GDB_VERSION_7_10 ############################################################################### comment "Legacy options removed in 2018.05" +config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT + bool "docker-engine static client option renamed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_CLI_STATIC + help + For consistency reasons, the option + BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT has been renamed to + BR2_PACKAGE_DOCKER_CLI_STATIC + config BR2_PACKAGE_MEDIAART_BACKEND_NONE bool "libmediaart none backend option renamed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2aeb8d0f10..28c1452a0f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2007,6 +2007,7 @@ menu "System tools" source "package/dcron/Config.in" source "package/ddrescue/Config.in" source "package/debianutils/Config.in" + source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-containerd/Config.in" source "package/docker-engine/Config.in" diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in new file mode 100644 index 0000000000..82c35c453d --- /dev/null +++ b/package/docker-cli/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_DOCKER_CLI + bool "docker-cli" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Docker is a platform to build, ship, + and run applications as lightweight containers. + + https://github.com/docker/cli + +if BR2_PACKAGE_DOCKER_CLI + +config BR2_PACKAGE_DOCKER_CLI_STATIC + bool "build static client" + depends on !BR2_STATIC_LIBS + help + Build a static docker client. + +endif + +comment "docker-cli 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-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash new file mode 100644 index 0000000000..92b821de36 --- /dev/null +++ b/package/docker-cli/docker-cli.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 06a302b43d6a2110ca33808077ca025f4adf9992c32a3cebc5373ecc3cdd44a2 docker-cli-v18.06.0-ce-rc3.tar.gz diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk new file mode 100644 index 0000000000..f11a8b514e --- /dev/null +++ b/package/docker-cli/docker-cli.mk @@ -0,0 +1,29 @@ +############################################################################### +# +# docker-cli +# +################################################################################ + +DOCKER_CLI_VERSION = v18.06.0-ce-rc3 +DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION)) +DOCKER_CLI_WORKSPACE = gopath + +DOCKER_CLI_LICENSE = Apache-2.0 +DOCKER_CLI_LICENSE_FILES = LICENSE + +DOCKER_CLI_DEPENDENCIES = host-go host-pkgconf + +DOCKER_CLI_LDFLAGS = \ + -X github.com/docker/cli/cli.GitCommit=$(DOCKER_CLI_VERSION) \ + -X github.com/docker/cli/cli.Version=$(DOCKER_CLI_VERSION) + +ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y) +DOCKER_CLI_LDFLAGS += -extldflags '-static' +endif + +DOCKER_CLI_TAGS = cgo autogen +DOCKER_CLI_BUILD_TARGETS = cmd/docker + +DOCKER_CLI_INSTALL_BINS = $(notdir $(DOCKER_CLI_BUILD_TARGETS)) + +$(eval $(golang-package)) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index a76940b6c0..e1e8ce0065 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_DOCKER_CLI help Docker is a platform to build, ship, and run applications as lightweight containers. @@ -26,12 +27,6 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL bool "build experimental features" -config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT - bool "build static client" - depends on !BR2_STATIC_LIBS - help - Build a static docker client. - if BR2_PACKAGE_DOCKER_ENGINE_DAEMON choice diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c0ed338a5..592f570a09 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 faf546bf0fdcf32d4f9ddbe67759fb39871dc9ea42bddffea23286fcdbf28842 docker-engine-v18.06.0-ce-rc3.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a85f4b5784..b251befa09 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,25 +4,21 @@ # ################################################################################ -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.06.0-ce-rc3 +DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf +DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker DOCKER_ENGINE_LDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ -X main.Version=$(DOCKER_ENGINE_VERSION) -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y) -DOCKER_ENGINE_LDFLAGS += -extldflags '-static' -endif - DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen -DOCKER_ENGINE_BUILD_TARGETS = cmd/docker +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp @@ -32,11 +28,7 @@ endif ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_TAGS += journald DOCKER_ENGINE_DEPENDENCIES += systemd -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) -DOCKER_ENGINE_TAGS += daemon -DOCKER_ENGINE_BUILD_TARGETS += cmd/dockerd +DOCKER_ENGINE_TAGS += systemd journald endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) @@ -64,15 +56,16 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y) -DOCKER_ENGINE_INSTALL_BINS += dumb-init +DOCKER_ENGINE_INIT_BIN = dumb-init else -DOCKER_ENGINE_INSTALL_BINS += tini +DOCKER_ENGINE_INIT_BIN = tini endif define DOCKER_ENGINE_RUN_AUTOGEN cd $(@D) && \ 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 @@ -80,7 +73,12 @@ endef DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) +define DOCKER_ENGINE_LINK_INIT + ln -s $(DOCKER_ENGINE_INIT_BIN) \ + $(TARGET_DIR)/usr/bin/$(DOCKER_ENGINE_INIT_BIN) +endef + +DOCKER_ENGINE_POST_INSTALL_HOOKS += DOCKER_ENGINE_LINK_INIT define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ @@ -96,6 +94,4 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef -endif - $(eval $(golang-package))