From patchwork Tue Jan 16 21:40:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 861909 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=exablox-com.20150623.gappssmtp.com header.i=@exablox-com.20150623.gappssmtp.com header.b="rPL5Fsk6"; 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 3zLkM403fhz9s82 for ; Wed, 17 Jan 2018 08:46:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CC4B089079; Tue, 16 Jan 2018 21:46:36 +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 S9RvfHKdRSBm; Tue, 16 Jan 2018 21:46:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B615C88FAA; Tue, 16 Jan 2018 21:46:33 +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 80EEA1C0485 for ; Tue, 16 Jan 2018 21:46:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7964B3007C for ; Tue, 16 Jan 2018 21:46:32 +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 LhOtvRRyWTgF for ; Tue, 16 Jan 2018 21:46:30 +0000 (UTC) X-Greylist: delayed 00:05:24 by SQLgrey-1.7.6 Received: from mail-pl0-f44.google.com (mail-pl0-f44.google.com [209.85.160.44]) by silver.osuosl.org (Postfix) with ESMTPS id 1D3C830078 for ; Tue, 16 Jan 2018 21:46:30 +0000 (UTC) Received: by mail-pl0-f44.google.com with SMTP id 66so7169753plc.13 for ; Tue, 16 Jan 2018 13:46:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exablox-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=gbKgmLQZdAUgqYxKjWtqJwik8Cb9Tfg908uduMlTYoM=; b=rPL5Fsk6wyvqG7Olg3rdSmUbm93C8lByOBbv6smHS3hyNVmaDc0+oMNJMum568uWHM gmdPOO8to1tU0ktLWQ4/ug+fVVL+uJM282ks+ek85sFSiYjmv9VS6pm71dJKx/Bo5vDs 24SnUwQa1HDGd4DLRNSTbB8nkCnslVIumr+NJUFp3HFVHV0OTT6twXh7aejnYSJxbutU NtH7d5qBK3DZPBVs+8qjvmiKtgwAhqp6fnKtWLvz4XI/RuFpmACXU3n6usK2xygKiGns LH1mTe9bcyUYgUqdB01YVReaAlnVi9wYUDvAJakB2hGoDs7qNUWVhcIFC3yxKK7idHGb R/tw== 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=gbKgmLQZdAUgqYxKjWtqJwik8Cb9Tfg908uduMlTYoM=; b=Va/tQF4DGqJsFeUEmskGu0d5JNGu6yOEta+vgliM9qdH8+dhzKsTCmtq9vxvOwR+Xb Okx0J0Xwnfiw4vPC3gL3ZeBiaYdzpBU8nMCp6/x5pSchbhM4rR8IYiMXdUx2BoZlOTU2 I1mM5KJ+ctQEnuysfwI3Bf8pGu5rBmwOnwLDx5ZrCXC4duHf1KbbrkHkWz4L3+kiRtHB +MsfdMFmQS8J0mL3a+c0BR1M7P+X5TwkE9pYhUsvS2I21AzBvLPNXMVFshOcinzPy07T +2U+zyAAmTk3nWWhdDawp+yRepcXt8husWRnz9FQywwSyrXkPjX7rtnWaGlgqh6iNN6I xaRQ== X-Gm-Message-State: AKGB3mKdaChFQollmnGSO97VhZifqaFGssp2JKcf7j1ohAYnihNj+/fj Evc+Yx9tgPSyz61WxF76RBLWMDLT X-Google-Smtp-Source: ACJfBosRDjBSBQ+r6qKlPv5KCIA+GG6b8AqjDw2eqVgiEH0k7NhHYovoQ9G9g6Vy1YX1xYqQL3gLPg== X-Received: by 10.84.240.131 with SMTP id z3mr33980741plk.404.1516138865380; Tue, 16 Jan 2018 13:41:05 -0800 (PST) Received: from localhost.localdomain (50-1-97-2.dedicated.static.sonic.net. [50.1.97.2]) by smtp.gmail.com with ESMTPSA id k10sm4264600pgq.89.2018.01.16.13.41.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Jan 2018 13:41:04 -0800 (PST) From: Charles Hardin X-Google-Original-From: Charles Hardin To: buildroot@buildroot.org Date: Tue, 16 Jan 2018 13:40:46 -0800 Message-Id: <20180116214046.10605-1-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) Subject: [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" During the bringup of some of the network within the containers, an error was show about missing the docker-proxy - so, add the definitions to build the proxy Signed-off-by: Charles Hardin --- package/docker-engine/docker-engine.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8928f072e7..94552b1201 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -87,6 +87,20 @@ endef ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) +define DOCKER_ENGINE_BUILD_PROXY + cd $(@D)/gopath/src/github.com/docker/docker; \ + $(DOCKER_ENGINE_MAKE_ENV) \ + $(HOST_DIR)/bin/go build -v \ + -o $(@D)/bin/docker-proxy \ + -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ + -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \ + github.com/docker/libnetwork/cmd/proxy +endef + +define DOCKER_ENGINE_INSTALL_PROXY + $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy +endef + define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service @@ -113,12 +127,14 @@ define DOCKER_ENGINE_BUILD_CMDS -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \ github.com/docker/docker/cmd/$(target) ) + $(DOCKER_ENGINE_BUILD_PROXY) 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_INSTALL_PROXY) endef $(eval $(generic-package))