From patchwork Wed Jun 7 22:56:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 772729 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wjkSw5q2wz9sCZ for ; Thu, 8 Jun 2017 08:56:48 +1000 (AEST) 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="sGW0uHx4"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2119F89590; Wed, 7 Jun 2017 22:56:44 +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 5Q5cjjscxtOG; Wed, 7 Jun 2017 22:56:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B11E48954D; Wed, 7 Jun 2017 22:56:42 +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 7DD9C1C0664 for ; Wed, 7 Jun 2017 22:56:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 74E7989329 for ; Wed, 7 Jun 2017 22:56:39 +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 ByGfOTM9IFrM for ; Wed, 7 Jun 2017 22:56:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by hemlock.osuosl.org (Postfix) with ESMTPS id 52DB689242 for ; Wed, 7 Jun 2017 22:56:37 +0000 (UTC) Received: by mail-pf0-f170.google.com with SMTP id 9so10421285pfj.1 for ; Wed, 07 Jun 2017 15:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paral-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=SVV/NVPjIfZ7kFc1eOhUrjvxMCADuCJyY8xaO8vlLQA=; b=sGW0uHx4voW9i6mEypdKiKJ+GpcW6bYEhEicvuEghjHU3Z+Iqr3NaBPPPSFZazwXhW Aa3kDzsqklyKoTOi+mfyEg/MfN+qSVpCjqUkbRhR7xZier+Gf1rAhqaeGnMiK7yAFC2a lEMJpdVP9geyv0R0BLgY2xeVm2JYw34YlMb0XQrN2YV9Hhxs/IwsmbERANDCJ3IUbHPu 6LzI/zjY6iMPRuw/sqSUgA82sXSB889oeNNyC2sRiY5X4bebE7JehZcAGkMvCwywwMe3 iCvqN0szzko2pxjwVWke3AfXwOrJXQJ65A3NO73hyR0ow8CuW0STZIIFPXnDg6RKDyva OPHw== 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=SVV/NVPjIfZ7kFc1eOhUrjvxMCADuCJyY8xaO8vlLQA=; b=TEaiLzukJy3A5uZmDl5xee4Nb0ThRg9nQIqS/59lEKGU3JcmeBATxb+JVz9Ikt8mLa wSzncSEKVoP4bv4sAmr7RT3p06bmuowiitpsXgcbkEBWXvWZQxfjT3UoUHy2QwGjpPSm trP5LhSegWgKi4UzmWdLKHo0uZbmzBJVTXLUF4atkBcscIPBHVrgOQTwP8tl5XiplYpT CsrhM1iseEYkgZf8GXDuOL2twa6LhKv5GfEth4eyAqpwjLZmEsnf2q0CWGa7HsaC4drm T5bprtFZMjwgQiybNmlUOCzX/vtS76v1mY4PdguvuFCd/w4wLtbFpfbup0udg09PRflc NXNw== X-Gm-Message-State: AODbwcAxDvciN1/5V4fBiuyELpkv8Acp3+Sj9WUoZP88543ZvE9l/9Vl KBWCBOgrSc79yZ7wDhM= X-Received: by 10.98.129.131 with SMTP id t125mr19581771pfd.173.1496876196232; Wed, 07 Jun 2017 15:56:36 -0700 (PDT) Received: from ember.vonkarman.net (guest-186.vonkarman.net. [207.151.223.186]) by smtp.gmail.com with ESMTPSA id i67sm6196105pfk.87.2017.06.07.15.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 15:56:35 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Wed, 7 Jun 2017 15:56:27 -0700 Message-Id: <20170607225628.31423-1-christian@paral.in> X-Mailer: git-send-email 2.10.2 Cc: thomas.petazzoni@free-electrons.com, geoff@infradead.org, Christian Stewart Subject: [Buildroot] [PATCH 1/2] 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 e00b162..59d3bd7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1819,6 +1819,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 0000000..4f414b2 --- /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 0000000..9258348 --- /dev/null +++ b/package/docker-proxy/docker-proxy.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 49d31e8b386b88d45d9c417d8d775fa647ecdc66f8e2a93a35f401c7bc8c9c1c 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 0000000..3bf6546 --- /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))