From patchwork Tue Feb 12 09:35:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1040475 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.137; helo=fraxinus.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="LXYDsqs7"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zHZn6hNsz9s4Z for ; Tue, 12 Feb 2019 20:35:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9DB4586146; Tue, 12 Feb 2019 09:35:43 +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 CIPDVPMaH4fA; Tue, 12 Feb 2019 09:35:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8E89E85BCF; Tue, 12 Feb 2019 09:35:40 +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 7E9AA1BF973 for ; Tue, 12 Feb 2019 09:35:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7B5B22262B for ; Tue, 12 Feb 2019 09:35:39 +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 88oJBKHabtyh for ; Tue, 12 Feb 2019 09:35:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by silver.osuosl.org (Postfix) with ESMTPS id CCCD022618 for ; Tue, 12 Feb 2019 09:35:38 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id y4so977158pgc.12 for ; Tue, 12 Feb 2019 01:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5qmtPj0kP4W/vY3vdp13NVqBDWioEmxilkGUcH2K420=; b=LXYDsqs7zAtejgtNNJ2s4xHO57z3X/AG/SOaC3yI+9dV326GdNfhG25UJjbIbmEKa9 fVBtqkex7U68otTeCM9PIXhPWGKjOj9dusXadcXUPY/ejr/0a5Z+VTOWEkMNlNWbl2/E AenYujmDxsdbQ+A4naxDFUI0RNUep3QhuDDrsFFXheZNJ47BukCNY2zXlKBGKOu7jaNu azLTH6dIoNnawj/ooFsIgz0JdWF5GM+tg3QyOqR8XDS9Coo0EP9llLI/mjGtmnbSDj9s Ncf7aT11Z56oVLgUWG0NMlcz1NEV/wlfmzP0x228/qR63b49JXTEnf5RIVEaQ4Xbssfb 7VCg== 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:mime-version :content-transfer-encoding; bh=5qmtPj0kP4W/vY3vdp13NVqBDWioEmxilkGUcH2K420=; b=CjqfRYvRrrth0KtVIBvudxNqN7qzW3uCKSk3VCvv5ebpTt8Wr04vI7d55ZiZEpA+Cm jKW4BBU2XOKVNQzEaCSy2aH7ybUYJdFwMUzyT92VcF8sJGTvhUekfOQ+fwPt1zrmLjE5 M0TWSYniiTjdPz7Un6KaHUyGOYUh3fNgCBHgbGI1MHkR7dXQkJ5Lq40EgJI0y6OmlbdL E9QoDHEoQjfmIKZP+UzmH5XL5VtKDY2aCcyFMKDcA6Ud/BCn5UaVDIAYh1wIc4HcacAF gMOBInUlXdNzmrM/VN7Gv+MBqXp4u50rPMc236UY6rUd7vHC45Yh/p6+/HjekenFZtyb linA== X-Gm-Message-State: AHQUAuarEwgQVn6LdcKAGY/CdYKMVoBfe9Fr0AZkXtLvBafTE42ws0Px NvCJvLaEdT4leoWxXHmHsyVtjwAhI+8= X-Google-Smtp-Source: AHgI3IaglmWU8Z6fRPtytw9mIt0MYBfm4mRv+5qGwJAGoU8zfftAvkL7Vjw4FHKDMRsYCvaw27T87Q== X-Received: by 2002:a63:fc4d:: with SMTP id r13mr2837319pgk.242.1549964137971; Tue, 12 Feb 2019 01:35:37 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-133-215.socal.res.rr.com. [172.91.133.215]) by smtp.gmail.com with ESMTPSA id y134sm923644pfb.175.2019.02.12.01.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 01:35:36 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Tue, 12 Feb 2019 01:35:28 -0800 Message-Id: <20190212093531.13145-1-christian@paral.in> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Hamilton Southworth , Christian Stewart , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christian Stewart --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 52bf8e03d2..cae88f40e2 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a2780aca4d72bb8aced14ca9de99bdc9a90bdaacb06c5ddd8378a66443c1d70f docker-containerd-v1.2.1.tar.gz +sha256 ff4c2ad680c9e2484e335868a54b0c1ea49d9165dd5b38b64ef7d9dacf2b96b4 docker-containerd-v1.2.3.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 12f2324a8c..9088c17660 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = v1.2.1 +DOCKER_CONTAINERD_VERSION = v1.2.3 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE From patchwork Tue Feb 12 09:35:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1040476 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="ukXIM1I1"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zHZq3Z4Zz9s4Z for ; Tue, 12 Feb 2019 20:35:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0474130C64; Tue, 12 Feb 2019 09:35: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 PeIZOXxn5hbD; Tue, 12 Feb 2019 09:35:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4FE262262B; Tue, 12 Feb 2019 09:35:44 +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 6C1DA1BF973 for ; Tue, 12 Feb 2019 09:35:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6888A2262B for ; Tue, 12 Feb 2019 09:35: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 V7zWyXvBQqGg for ; Tue, 12 Feb 2019 09:35:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by silver.osuosl.org (Postfix) with ESMTPS id E75AD22618 for ; Tue, 12 Feb 2019 09:35:39 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id y4so977184pgc.12 for ; Tue, 12 Feb 2019 01:35:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bUz8gIH0Kgoc36Viweg7y8O2CusAfImjpmsOJbq0XRo=; b=ukXIM1I1zT0trs8Z/JPteoupGda/bbqBfD1njvoguFaxjkkclNOa/Y3gj42TRw/jwQ Q5xXXZ475wLj48F2JSZropXgvJbDvH13XUj0eqDhi/FQggUmp878I3KXLdDVOmSeVV2f z8D7xrtTUhbjF19ixPtkhNwZ/VrYI3sy3HN/LoUYtoIqaIjlI6ZPNyyxOAKN5IIfVb4o sfaOgzxu0h/UmZmJPH99qTe+A/LiPz6l9wKEIM/c6ECz1yfI4sp5QYcIksPT2mqTMsY5 Cx0a8t7yk+woQ9oxzizudhiI1LrrtGHVMcFup8gsMRI2Hh35C+/b2udu2xR7SxQQPEs6 irKA== 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:mime-version:content-transfer-encoding; bh=bUz8gIH0Kgoc36Viweg7y8O2CusAfImjpmsOJbq0XRo=; b=UY1iyZMJu9K8XtcxdFQ8cAkk/FxWNYZST7bejAIcREguPyORQOLUeYNqlcOUQmZr/I TMv2cMjDOors4N9nTwAj6e+j1LcGuKqxBZh8NmzWQxUnrifRFXyfFI0vQxZ06g048/YF ME219rcVHGEMg6dixJa9i4SQuSrQdoQiE/J6FxTbSltfCcFtSmDlLNW4OZV3DXPdIQuq qtgsbAaYaIInMzS5IonJRQDV2ZNC1CTbLbz+ah30vHqjuU6STOo/0CnXrO5nU3o22DHH gj+LxMxKgb8VB1jRDwZYrRrBOk6HaScbQWfnir7fCPsP0yr9OO0GMaUys+sGZv53aUGF YxUg== X-Gm-Message-State: AHQUAuZPGjd/Z4Y25kSYlUgYags90dHWVh5HsBSzZRbOIrnz+oJqvWyN ssWt5xWRudDOt5qs8GPt1Z2LA+OKKlQ= X-Google-Smtp-Source: AHgI3Ibanzow9tCurKBNw+siQ6vNDsph/WTTWrnvotuxKhXKf37UhrBZDZmqLkT2b+4A7ONdggOOUQ== X-Received: by 2002:a62:3603:: with SMTP id d3mr3147989pfa.146.1549964139172; Tue, 12 Feb 2019 01:35:39 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-133-215.socal.res.rr.com. [172.91.133.215]) by smtp.gmail.com with ESMTPSA id y134sm923644pfb.175.2019.02.12.01.35.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 01:35:38 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Tue, 12 Feb 2019 01:35:29 -0800 Message-Id: <20190212093531.13145-2-christian@paral.in> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190212093531.13145-1-christian@paral.in> References: <20190212093531.13145-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Hamilton Southworth , Christian Stewart , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 03322a4f6d..9782f34baa 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e578406dead2fc72c4b52f77db39dc779fa8b460352116c06f1ae29219bd8c2 docker-cli-v18.09.0.tar.gz +sha256 29f3a435bfcd52dbe26f6315ee92bffc0220a537608935a2c3870f6b729fc16e docker-cli-v18.09.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index c73caa2652..c3dd536937 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = v18.09.0 +DOCKER_CLI_VERSION = v18.09.2 DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION)) DOCKER_CLI_WORKSPACE = gopath From patchwork Tue Feb 12 09:35:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1040478 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="TQ+GtRR8"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zHb03PSZz9s4Z for ; Tue, 12 Feb 2019 20:35:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E98098669E; Tue, 12 Feb 2019 09:35:51 +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 duzOhsXULeso; Tue, 12 Feb 2019 09:35:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E86658641F; Tue, 12 Feb 2019 09:35:49 +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 977421BF973 for ; Tue, 12 Feb 2019 09:35:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9499B85C11 for ; Tue, 12 Feb 2019 09:35:46 +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 Ued0Bkk3e4wE for ; Tue, 12 Feb 2019 09:35:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 14CF185DDB for ; Tue, 12 Feb 2019 09:35:41 +0000 (UTC) Received: by mail-pf1-f176.google.com with SMTP id b7so1023160pfi.8 for ; Tue, 12 Feb 2019 01:35:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D1M/0NlGYq0dXb4qxBiJmgVnsCtFYHBdrZ+gvA5nqbg=; b=TQ+GtRR8YpShMZc89cjN17ImCFxLI8uaSdpiQadO39siiTgsZU0MXaegyJxyjA7IUY sjGTxB/2wuCs2IU7njBvcv7RIXDcbTc/B0ATeopTT+p3nm8dTqsChuhk98ECuaUnA4Ut bcKr455bQN9fDVCyFkcw9B67uOZYpGlM4giC9Z8pi2PUYjxrPbml2W6xWVfriqf9XJBl 1hoHcBJwzSPLMfcAnirTJAr43bewMEsrHaeiAv1xrzxWgpnxEDltWZr3Y78MRObRYUby bgWdYdRLgozuRvp84lLqQpro4W40Yiaz3tkRCT9D2GD0KiDRJvz6mFHv2LIwjKD39mGZ yNMQ== 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:mime-version:content-transfer-encoding; bh=D1M/0NlGYq0dXb4qxBiJmgVnsCtFYHBdrZ+gvA5nqbg=; b=B5j1Ye/hQ+Nu74cDLfcbpX0NWj/FfB+oX7ofKp9cuLHwCzIhBSwXbdIr+Odu9Y7JT9 FiJ/dNEqpjo/wvu53IZDhf8RzPrT5YEk0JB3hiJjIOwQzfI8i5dfVe/k2wMTCxfQOSJm xmP38icqmJrp86fvs/Cg40fmPsMMxGlI8QiT23ok0J7HT06Pj4yCO/pDbV11PctL7lgE iqjK7baSpP6Aw6SfjtfDZfA5hN6opxEKt0ad5d0/4A/PZpyKULnu9mBCGbAA73/pHq66 9ZpNLhcy9xRxbpe2tT9/GqNax/Dav+E/DX9RfJS2xji4FfVQMROZHyDRCFKRgdBYFrPU 7HYw== X-Gm-Message-State: AHQUAuYong1q8zS+bIkAqXjA0mbQPHY+1kRrIu09yz3TF0d56vAWuPQX TnVkYTsGaq1PybUxs6d3Qly/T87GSk0= X-Google-Smtp-Source: AHgI3Ib6VQovVoTSltquwtZVaaThVqdNEAKRlLBcoUsbY6TbovrIHDWec8hfX1XbUrx1YormI+1NJg== X-Received: by 2002:a63:cf48:: with SMTP id b8mr2850359pgj.17.1549964140322; Tue, 12 Feb 2019 01:35:40 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-133-215.socal.res.rr.com. [172.91.133.215]) by smtp.gmail.com with ESMTPSA id y134sm923644pfb.175.2019.02.12.01.35.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 01:35:39 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Tue, 12 Feb 2019 01:35:30 -0800 Message-Id: <20190212093531.13145-3-christian@paral.in> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190212093531.13145-1-christian@paral.in> References: <20190212093531.13145-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/4] docker-engine: bump to v18.09.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Hamilton Southworth , Christian Stewart , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 1e3939f240..fe7b0d3b94 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5278b3f2b460ea61f47833abd2a844f348b4518e73f309294ad178c205a48e1 docker-engine-v18.09.0.tar.gz +sha256 4babbcbc3e1d7750c61a1e5bee29bd206256948961feaac5b44cabb0c70a50a6 docker-engine-v18.09.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index aae44ab6df..e2f59666df 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v18.09.0 +DOCKER_ENGINE_VERSION = v18.09.2 DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From patchwork Tue Feb 12 09:35:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1040477 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.137; helo=fraxinus.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="lBRRt7z6"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zHZv0rp2z9sMl for ; Tue, 12 Feb 2019 20:35:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E81B8623F; Tue, 12 Feb 2019 09:35: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 xusXTWYfQDKS; Tue, 12 Feb 2019 09:35:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2107085C86; Tue, 12 Feb 2019 09:35:47 +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 56A641BF973 for ; Tue, 12 Feb 2019 09:35:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 53B0987E72 for ; Tue, 12 Feb 2019 09:35:45 +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 egmEJdFQqQYj for ; Tue, 12 Feb 2019 09:35:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 978CE87E6C for ; Tue, 12 Feb 2019 09:35:42 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id w4so1042413plz.1 for ; Tue, 12 Feb 2019 01:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T8L5jfOx+WaqW73PPkXgPOL4K58Mlnzhp0AMugariwM=; b=lBRRt7z6kylUbe2MbuuV4hdKyf8xADVE+dKUS0TqI66rPQEt+BO4deXpw2qHppApc9 1RW5r4poDdr6h1tQ19GErmoSC6JE4b8ZNKEz43NdFkrUQMnh0lP9sPoR8ehxYab8NHsV aJaxg3yE2MZ5iz231Zi7rFAVKRrMxiCAK8dsSshKOzfwRR9RCZwCpMHDY1cH8SjO0tFg tqi+CWgemGO/1FrfeQAcOlAHUE+qxiJ91vq1yUzWxkMpTgNMrV6W26wNTd0xi8tJZ+mV BHYjtpHRbETt8CHG4lV7TUZUT5j9jkrhANq4DTGsoOoTgEylJBst0Pi3EP0SKgTxlIw4 zSwQ== 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:mime-version:content-transfer-encoding; bh=T8L5jfOx+WaqW73PPkXgPOL4K58Mlnzhp0AMugariwM=; b=SaWu2EAeTIg5aXrYv9hLNTLsLKmNSSCIJv+KJggL4m4iYKxXhukYCrxysD0eWIuoRX XTY23D4AolzdtjsKrshe4d9cpU8TdxZ1dfvT/0nUQrprDFQmDfOYmha1JUP5vysukPE5 w1gkR993ewPmb71PCQtbVq00W43hnT3WOQMOWyoXathm2r5iO8MpgTKq1va/k3BGdHYF MVd3KCFIUgfFXn8rqjRCFKrZ92B+/8XWKa1xy7+zsINEJbIuYNPbLYzlzcfAgv1cOEpT 4ih5cZ5pD2QNkL06Yokr9jTV6B+vAnXbLfMk/WP9R9wASahh8DA98oAJVuJ+DjON/k1V WBFA== X-Gm-Message-State: AHQUAuY6psG/xClQvcqbdJ0TjNviLc7732XXWYynNBeWcmTFaLMXwWj3 Hk+payuILdWPOHGxNpcKtxBYDDjLvvA= X-Google-Smtp-Source: AHgI3IY6vdLHFzr2ELR3VZxpQ5cT4lRsOhon3CGURpwDZWhBiLS2VOIQfxspK/yxbVIak3OgMy8HPg== X-Received: by 2002:a17:902:28aa:: with SMTP id f39mr3061375plb.297.1549964141684; Tue, 12 Feb 2019 01:35:41 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-133-215.socal.res.rr.com. [172.91.133.215]) by smtp.gmail.com with ESMTPSA id y134sm923644pfb.175.2019.02.12.01.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 01:35:40 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Tue, 12 Feb 2019 01:35:31 -0800 Message-Id: <20190212093531.13145-4-christian@paral.in> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190212093531.13145-1-christian@paral.in> References: <20190212093531.13145-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Hamilton Southworth , Christian Stewart , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes the startup warning from Docker: failed to retrieve runc version: unknown output format: runc version commit ... Introduces a patch to replace the faulty version detection logic in the Docker engine. Signed-off-by: Christian Stewart --- ...ix-faulty-runc-version-commit-scrape.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch diff --git a/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch b/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch new file mode 100644 index 0000000000..dc47a8f9ef --- /dev/null +++ b/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch @@ -0,0 +1,45 @@ +From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Mon, 26 Nov 2018 22:59:32 -0800 +Subject: [PATCH] Fix faulty runc version commit scrape + +This commit replaces faulty logic to determine the runc version commit hash. + +The original logic takes the second line of the output of "runc --version" and +does not work if there are a different number of lines printed from the command +than expected. The buildroot version of runc outputs two lines instead of the +expected three, causing the error: + +unknown output format: runc version commit: ... + +This patch replaces this logic with a simple scan of the "runc --version" +output, searching for the "runc version commit" prefixed line. + +Signed-off-by: Christian Stewart +--- + daemon/info_unix.go | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/daemon/info_unix.go b/daemon/info_unix.go +index 60b2f99870..688a510796 100644 +--- a/daemon/info_unix.go ++++ b/daemon/info_unix.go +@@ -32,10 +32,11 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) + defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path + if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil { + parts := strings.Split(strings.TrimSpace(string(rv)), "\n") +- if len(parts) == 3 { +- parts = strings.Split(parts[1], ": ") +- if len(parts) == 2 { +- v.RuncCommit.ID = strings.TrimSpace(parts[1]) ++ for _, pt := range parts { ++ ptKv := strings.Split(pt, ":") ++ if strings.HasSuffix(strings.TrimSpace(ptKv[0]), "commit") { ++ v.RuncCommit.ID = strings.TrimSpace(ptKv[1]) ++ break + } + } + +-- +2.18.1 +