From patchwork Wed Sep 20 03:02:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 815980 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="UpTrTef4"; 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 3xxl9N2sMBz9s82 for ; Wed, 20 Sep 2017 13:10:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BDFD12E4C6; Wed, 20 Sep 2017 03:10:14 +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 Hv40tji1qyUb; Wed, 20 Sep 2017 03:10:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 951362E6B5; Wed, 20 Sep 2017 03:10:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 08E231C0169 for ; Wed, 20 Sep 2017 03:10:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 00C1D8462E for ; Wed, 20 Sep 2017 03:10:13 +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 5oc1SV-tXSEc for ; Wed, 20 Sep 2017 03:10:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 048C08457B for ; Wed, 20 Sep 2017 03:10:12 +0000 (UTC) Received: by mail-wr0-f171.google.com with SMTP id 108so1022263wra.5 for ; Tue, 19 Sep 2017 20:10:11 -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=ZZsVxE+Iz2k9IsqL98c13EbKmR+tf83ZHAAjjRGEN54=; b=UpTrTef4+wmHCSwExuzuRXWZkmxhZG5o8TQrSXt01Gu/PAP3U5sDIs61frIPQJs1Qx RDkNHcndrTuOVbm/wnwQZwl8qReoSDKsokDujMvv9bMMQYgAHRMYZMIKLaacOT1HmRPi 94fzW27x1SV8mnVyxSfQJWxJZadEqwP5HfomuFqkDRpotLZ+lNAqTWKW/ZAJjzKo2ear MYqn7zk5TcKMk8315jJNeHaK3RcS/8SP2dergyTiDnJGONdpbdR5hHFgtYd9mRl6T+mL MPeV5iRxV0r8uurfWqqAwjz85ZPz9zokETumBLGR3h1D9soLyvtn7BSroBopADCoduD5 V1Sg== 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=ZZsVxE+Iz2k9IsqL98c13EbKmR+tf83ZHAAjjRGEN54=; b=GpRhNjs/x0P/QG5Lgw0a4fwyhRvdH0NnzRnXWtC0Bekf8d4kThpfV0XqTX/bGr8Hc4 Fw7nG1j2VurT132QVjLFkFbjkLVB8x5BZNtzD2ghFjKK7YrIXepnFd7uVrITBJzvhvCO W3QuSQ8ZpGlh7ZHHEjZAlzn5OfKVyRxZNu/+BtRMrs8J0HRB3NrdVmt0y0F/XTvSUkSO YHSJtrqK1G1YR1E1GeVxrNpRSW6OA4FatLojSRX8qKH5LbO1+NquRSPCk94A4Hurh5Us gJ0+iq0YoNDo3/QqObD2nXK+qnJD4LdyXjCehfqPDAtOEec8eeAPoHcgRskmkAFA7uHA deqA== X-Gm-Message-State: AHPjjUge1jZPUsJosFxmtc3NHoOxNBCZRMeC1AEO0SHUJUI4vndEZZyG VgBAgrfkO9VVMBPCt57lVMr+fXZV X-Google-Smtp-Source: AOwi7QBwa+D3yIskwz/AOjbh5AeKJB0RxuZeZwhrvx9tbgexIqWGUC9w+ie9lILkMYfGJ+NGl+Bu7g== X-Received: by 10.223.164.71 with SMTP id e7mr2992045wra.4.1505876542240; Tue, 19 Sep 2017 20:02:22 -0700 (PDT) Received: from ember.home ([2a00:23c1:5b80:3501:e08a:3b55:75b1:41fb]) by smtp.gmail.com with ESMTPSA id i131sm585601wmf.31.2017.09.19.20.02.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Sep 2017 20:02:21 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 20 Sep 2017 04:02:06 +0100 Message-Id: <20170920030210.19446-6-christian@paral.in> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170920030210.19446-1-christian@paral.in> References: <20170920030210.19446-1-christian@paral.in> Cc: thomas.petazzoni@free-electrons.com, geoff@infradead.org, Christian Stewart Subject: [Buildroot] [PATCH 5/9] 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 b3fb8fa222..872bd95829 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1876,6 +1876,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))