From unknown Tue Aug 19 14:22:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#35281] [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Apr 2019 23:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35281 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35281@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.155528351632159 (code B ref -1); Sun, 14 Apr 2019 23:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Apr 2019 23:11:56 +0000 Received: from localhost ([127.0.0.1]:33295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoHv-0008MX-H8 for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoHt-0008MJ-2N for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:53293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hFoHm-0005Z8-GQ for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFoHk-0006v7-09 for guix-patches@gnu.org; Sun, 14 Apr 2019 19:11:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hFo9L-000855-O1 for guix-patches@gnu.org; Sun, 14 Apr 2019 19:03:01 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:42840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hFo9L-00084O-0G for guix-patches@gnu.org; Sun, 14 Apr 2019 19:02:59 -0400 Received: by mail-qt1-x832.google.com with SMTP id p20so17135523qtc.9 for ; Sun, 14 Apr 2019 16:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=uFeN9Nl1N7BO9beJ5SsuKaiIhNG6723feJ6tCjPi9yg=; b=EUfkKzdtuW2haSv1vtQzHZDMUW7bCMKkDCPNJldEpsMBFIUC82S7LsnlN3E0p7Vg3s C5gxQZ4ELCJvOWoKok5QocVhQadbw/3g7M3IL+8EwxTL7dryVnNsCIQkS7vZ/3jDdQ43 al+o8O/4dhsL4oU3qnd7HRVd7rGu83YLuwpMn+/KB3+c8FMJwoR1Po6wtEQvI+r459hI WPZRMQ7dZN6RVNTdrxIEfSpvW40ii3r4h0Wp3iTxlZiuDFLmIG9pEMFs/Z7g5u1AalCq OVW7ALM+0DlviAqwXnB2JaL5K0+YXqg3B/VEcJ/fT+y8LSoAfLLlzuUTx+bu8acsHHGn 6sJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=uFeN9Nl1N7BO9beJ5SsuKaiIhNG6723feJ6tCjPi9yg=; b=gnn8X0NIq9E7BwohHn56BBkqA7sn2C4M06sSSo/QqvXI6sO+/HSDrBfLAVGIV37chb fUVUjrrU2RaFKzotxoxPQy0iplsXXqf2IbducfeK1KlFmary39NV/kSJgNrofYGsujsQ VbO1EnnTB2RJFWvxBX836wGAaoB0ci1pOEqPy4azVhN55LJH8okkC0h0tlkDiBOdEg6T LDV4hdUr6MrtOhjwKRf7aKVyXCWQIsrUUP0ayBCeuEUNNzX69OfojuRCAS4P49tYqfM3 4vBUwjeWzP+x+flMmC5o39YOOFrzrVtqz1pAG2Orb3vEmlQXF91q/pIbPctVyId9tX9x rJcg== X-Gm-Message-State: APjAAAXALdLN9pmLefrEtpgz5+qyRxXrSVaf56IAQZq++IGeENHLbpDt tWduwUspD5UOAkZkz0/YDT1TZ9l1 X-Google-Smtp-Source: APXvYqy0CldgXR7yz2QwkJ/c5q1bmJa421pEjebrhF5j0SaS7RUYN3Lj+15VG7WbsIcdzFRJ5xwZAw== X-Received: by 2002:ac8:72cb:: with SMTP id o11mr53574683qtp.84.1555282978068; Sun, 14 Apr 2019 16:02:58 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id r31sm28172903qtj.17.2019.04.14.16.02.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 16:02:56 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 14 Apr 2019 19:02:53 -0400 Message-ID: <87muksnqaq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::832 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Guix! Before this change, attempting to start a docker registry such as with the following command[0]: --8<---------------cut here---------------start------------->8--- docker run -d -p 5000:5000 --restart=always --name registry registry:2 --8<---------------cut here---------------end--------------->8--- Would give the following error: --8<---------------cut here---------------start------------->8--- /gnu/store/dzaijl53fcd3jhkpd70vsf4cnvv10ywj-docker-cli-18.09.3/bin/docker: Error response from daemon: driver failed programming external connectivity on endpoint registry (709754084a9e208c32075e47ea9584296a6f274deeef08283d0de9c9a5161112): exec: "docker-proxy": executable file not found in $PATH. --8<---------------cut here---------------end--------------->8--- This series of patches adds docker-libnetwork-cmd-proxy and a few new go packages it required. The docker service is modified to enable (or disable) using a 'docker-proxy'. Thanks! Maxim --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-go-sctp.patch Content-Transfer-Encoding: quoted-printable From=202e46dd6c449679ecae6a13a7a922eaf6b6947164 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:07:58 -0400 Subject: [PATCH 1/6] gnu: Add go-sctp. * gnu/packages/networking.scm (go-sctp): New variable. =2D-- gnu/packages/networking.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 46aed1e549..5163726393 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,6 +26,7 @@ ;;; Copyright =C2=A9 2018 Marius Bakke ;;; Copyright =C2=A9 2018 Oleg Pykhalov ;;; Copyright =C2=A9 2018 Pierre Neidhardt +;;; Copyright =C2=A9 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -730,6 +732,31 @@ manage, and delete Internet resources from Gandi.net s= uch as domain names, virtual machines, and certificates.") (license license:gpl3+))) =20 +(define-public go-sctp + ;; docker-libnetwork-cmd-proxy requires this exact commit. + (let ((commit "07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb") + (revision "1")) + (package + (name "go-sctp") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ishidawataru/sctp.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mk9ncm10gwi5pn5wcw4skbyf4qg7n5qdf1mim4gf3mrckvi6g6h"))= )) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/ishidawataru/sctp")) + (home-page "https://github.com/ishidawataru/sctp") + (synopsis "SCTP library for the Go programming language") + (description "This library provides methods for using the stream con= trol +transmission protocol (SCTP) in a Go application.") + (license license:asl2.0)))) + (define-public httping (package (name "httping") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-go-netns.patch Content-Transfer-Encoding: quoted-printable From=200081c4231f9e25879c287fca54ec9db4929d1711 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:53:00 -0400 Subject: [PATCH 2/6] gnu: Add go-netns. * gnu/packages/networking.scm (go-netns): New variable. =2D-- gnu/packages/networking.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5163726393..1407f6208e 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -732,6 +732,31 @@ manage, and delete Internet resources from Gandi.net s= uch as domain names, virtual machines, and certificates.") (license license:gpl3+))) =20 +(define-public go-netns + (let ((commit "13995c7128ccc8e51e9a6bd2b551020a27180abd") + (revision "1")) + (package + (name "go-netns") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netns.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"))= )) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netns" + #:tests? #f)) ;tests require root privileges + (home-page "https://github.com/vishvananda/netns") + (synopsis "Simple network namespace handling for Go") + (description "The netns package provides a simple interface for +handling network namespaces in Go.") + (license license:asl2.0)))) + (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. (let ((commit "07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-Add-go-netlink.patch Content-Transfer-Encoding: quoted-printable From=202a8b23da6fe7ef09f0931231c67f25cd4c60f24f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:57:44 -0400 Subject: [PATCH 3/6] gnu: Add go-netlink. * gnu/packages/linux.scm (go-netlink): New variable. =2D-- gnu/packages/linux.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e8ee4df4f3..c8adf52ff8 100644 =2D-- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -33,6 +33,7 @@ ;;; Copyright =C2=A9 2018 Pierre Langlois ;;; Copyright =C2=A9 2018 Vasile Dumitrascu ;;; Copyright =C2=A9 2019 Tim Gesthuizen +;;; Copyright =C2=A9 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libunwind) @@ -116,6 +118,7 @@ #:use-module (gnu packages swig) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -5151,6 +5154,33 @@ nfnetlink_queue, nfnetlink_conntrack) and their resp= ective users and/or management tools in userspace.") (license license:gpl2))) =20 +(define-public go-netlink + (package + (name "go-netlink") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netlink.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netlink")) + (native-inputs + `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix) + ("go-netns" ,go-netns))) + (home-page "https://github.com/vishvananda/netlink") + (synopsis "Simple netlink library for Go") + (description "The netlink package provides a simple netlink library for +Go. Netlink is the interface a user-space program in Linux uses to +communicate with the kernel. It can be used to add and remove interfaces,= set +IP addresses and routes, and configure IPsec.") + (license license:asl2.0))) + (define-public xfsprogs (package (name "xfsprogs") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-docker-libnetwork.patch Content-Transfer-Encoding: quoted-printable From=20721d1a93961bf653a02cccdbfaf92e0514a3ae59 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:32:40 -0400 Subject: [PATCH 4/6] gnu: Add docker-libnetwork. * gnu/packages/docker.scm (docker-libnetwork): New private variable. =2D-- gnu/packages/docker.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a11ce266d2..df0bbca1bc 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -227,6 +227,47 @@ network attachments.") (home-page "http://containerd.io/") (license license:asl2.0))) =20 +;;; Private package that shouldn't be used directly; its purposes is to be= used +;;; as a template for the various packages it contains. +(define docker-libnetwork + ;; There are no recent release for libnetwork, so choose the last commit= of + ;; the branch that Docker uses, as can be seen in the Docker source file + ;; 'hack/dockerfile/install/proxy.installer'. + (let ((commit "4725f2163fb214a6312f3beae5991f838ec36326") + (version "18.09") + (revision "1")) + (package + (name "docker-libnetwork") + (version (git-version version "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/libnetwork.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zpnxki8qfzha6ljahpwd3vkzmjhsvkmf73w6crm4ilxxw5vnpfb")) + ;; Delete bundled ("vendored") free software source code. + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/docker/libnetwork/" + ;; The tests fail with the error: + ;; src/github.com/docker/libnetwork/network.go:1057: Warnf format= %q + ;; has arg n.configOnly of wrong type bool. + #:tests? #f)) + (home-page "https://github.com/docker/libnetwork/") + (synopsis "Networking for containers") + (description "Libnetwork provides a native Go implementation for +connecting containers. The goal of @code{libnetwork} is to deliver a robu= st +container network model that provides a consistent programming interface a= nd +the required network abstractions for applications.") + (license license:asl2.0)))) + ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, ;; brige, nf_conntrack_netlink, aufs. (define-public docker =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-Add-docker-libnetwork-cmd-proxy.patch Content-Transfer-Encoding: quoted-printable From=20843ecd2ff5aa5f69ea8a83f2da8e0d783be4b36a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:33:38 -0400 Subject: [PATCH 5/6] gnu: Add docker-libnetwork-cmd-proxy. * gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): New variable. =2D-- gnu/packages/docker.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index df0bbca1bc..1067555296 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages golang) #:use-module (gnu packages linux) + #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-web) @@ -268,6 +269,28 @@ container network model that provides a consistent pro= gramming interface and the required network abstractions for applications.") (license license:asl2.0)))) =20 +(define-public docker-libnetwork-cmd-proxy + (package + (inherit docker-libnetwork) + (name "docker-libnetwork-cmd-proxy") + (arguments + `(#:import-path "github.com/docker/libnetwork/cmd/proxy" + #:unpack-path "github.com/docker/libnetwork" + #:install-source? #f)) + (native-inputs + `(("go-sctp" ,go-sctp) + ;; For tests. + ("logrus" ,go-github-com-sirupsen-logrus) + ("go-netlink" ,go-netlink) + ("go-netns" ,go-netns) + ("go-golang-org-x-crypto-ssh-terminal" + ,go-golang-org-x-crypto-ssh-terminal) + ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) + (synopsis "Docker user-space proxy") + (description "A proxy running in the user space. It is used by the +built-in registry server of Docker.") + (license license:asl2.0))) + ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, ;; brige, nf_conntrack_netlink, aufs. (define-public docker =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-services-docker-Add-new-fields-to-support-proxy.patch Content-Transfer-Encoding: quoted-printable From=20fd1003dc333ede95a8fa2813b7e8ab2f6cfe82d2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:34:16 -0400 Subject: [PATCH 6/6] services: docker: Add new fields to support proxy. The Docker proxy enables inter-container and outside-to-container loopback, and is required by the Docker registry server. * gnu/services/docker.scm (docker-configuration)[proxy, enable-proxy?]: Add fields. (docker-shepherd-service): Use them. (serialize-boolean): New function. =2D-- gnu/services/docker.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 8b5edf5cb0..94a04c8996 100644 =2D-- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -31,13 +31,25 @@ #:export (docker-configuration docker-service-type)) =20 +;;; We're not using serialize-configuration, but we must define this becau= se +;;; the define-configuration macro validates it exists. +(define (serialize-boolean field-name val) + "") + (define-configuration docker-configuration (docker (package docker) "Docker daemon package.") (containerd (package containerd) =2D "containerd package.")) + "containerd package.") + (proxy + (package docker-libnetwork-cmd-proxy) + "The proxy package to support inter-container and outside-container +loop-back communications.") + (enable-proxy? + (boolean #t) + "Enable or disable the user-land proxy (enabled by default).")) =20 (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -66,7 +78,9 @@ (stop #~(make-kill-destructor))))) =20 (define (docker-shepherd-service config) =2D (let* ((docker (docker-configuration-docker config))) + (let* ((docker (docker-configuration-docker config)) + (enable-proxy? (docker-configuration-enable-proxy? config)) + (proxy (docker-configuration-proxy config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -83,7 +97,10 @@ udev)) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") =2D "-p" "/var/run/docker.pid") + "-p" "/var/run/docker.pid" + (if #$enable-proxy? "--userland-proxy" "") + "--userland-proxy-path" (string-append #$proxy + "/bin/pr= oxy")) #:pid-file "/var/run/docker.pid" #:log-file "/var/log/docker.log")) (stop #~(make-kill-destructor))))) =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAlyzvB0ACgkQEmDkZILm NWKluxAAkXmqru8+EbF9ZMugp9aiZd3GlGWnGl/p/Y3qohkry0rvepGGeLP+RXxY MtEEiryKXN/qDi5GMfyKkTigreJ5UVAPLGIM3QRhSfd1r6LDWLMJuatjS8FZ0xdC fh+tg4TdnqMhwWqASlIOpYb9AE9neidU6VjycPshjyVaHjJ/1rqPgcJAPBO8bPGz bkskq0RuINhD1wcVidayEsqssiPJ2IgwYgxwWeArNuARJphdmzfEXinaU0PJqIyQ hNB43VoBP3aGEJ+rmhChzoJAVLpj/yD1Iw+yr0MjD92nj+8iPpyBTMi78xJlV8dp 6kvyjHbX+8QESVfNXTToYofcITWs7HJfFcqYdxDUEYMwfCxaK8VjJhfsImgjqdWd X3m7jT6FZHRfeDH26NnGR/a1asQ4ZNEdog1foK0F+L54cWh2a82moyjQJ1ceDCw+ 4RNGhpJPcKFjl70Kv/0T+46jCewlmdwgZ7tfiq4BWoc3wE57dIq+5gYbZLqboeUU kh2+KeGWBrPVn1CxworWvEM8iz+KnSS442Xl5aoAxM64c2UQEGgHA5A+SuzKshB/ +UgrE7sc9sMjlTsvQRAkSA1sSely0mqWcSLLZ7YGnoK8NdjZqZzR1AzNJjF86nLD gCOk3oBeUjPah5Rvg5kJ+j7U0H2zs0ENsVJh8TTMHmVgL3jzU3o= =vMxW -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 19:31:20 2019 Received: (at control) by debbugs.gnu.org; 14 Apr 2019 23:31:20 +0000 Received: from localhost ([127.0.0.1]:33319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoam-0000QQ-9l for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:31:20 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:40007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoak-0000QD-EU for control@debbugs.gnu.org; Sun, 14 Apr 2019 19:31:18 -0400 Received: by mail-qt1-f180.google.com with SMTP id x12so17182323qts.7 for ; Sun, 14 Apr 2019 16:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=hYpDc4GYVXnsCUOoKdDd2IOT3JcdKq8kKS6Pi2KNTys=; b=b1DMwIk4F8RyNdEmdvwNKutCz7z9zso8W9Kt2dBbn/uRGbL0ZCxOg5TXsXRfk3ANdl IiiAcigvHccrGgee1J7+lsXMILEBBItMGFiGPOwm6BbVY3o3JpcmB2U0NoaHV9HAvkYm qWQbwEZZIotwu2qc32oA8v/UE47ia3ZDlIYexRn4886try5hKq7cCN81QrDqG+1rKax/ JycbbMxKHCf85/ke6ngAXz3vRAhAL9hvgqX/Yxhiqfnx8peSPPvKyCIQ++kg3+Jf6uSE y3MPFM4a/DdMsgHkCQLplfYDrMq87CkK0uGHHJ/Esl3q12lE0sp2qG3tRED8YWLc2eO4 AHlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=hYpDc4GYVXnsCUOoKdDd2IOT3JcdKq8kKS6Pi2KNTys=; b=lDulFQgvR3VCznr8Blg9oUl5pWvaZv6dw60qubCBurBoCe9yc3kjdkrVTz56PJ5MBb WhoYP/VPJkhYNbDXD3Q4qaAckJZaOqM4Chh5rJ7aIIgqNNbuppPDHJg4TGxhKt3fC4xy +BkSqGdBULXSBsKUv/GsqUVRVxBM3sjTE0MK1ZdnwHdBUAqnVzQHpiEdvCsQRmdR3Bu2 MP0oMgoXWyhGBwv37fLKrsoH21QJ4JYWtxfokPkwzEH7jf8XzniTKxz9pA2HIvICsbpg MdQdsmSlpHTvjvqjaDv+Ta2lnBPT1tS4j8u+9OhO4Tk67y+kCOoUJVLTYQN8O1Tag7sO JZ3g== X-Gm-Message-State: APjAAAVt9cpZo2SlCL0pjDV6Q1RKfER09lglcFfqLKOYcC22KzE8VGYE +BQB1P7oYHBPEBLaJQCL7wCoZ5H7 X-Google-Smtp-Source: APXvYqwEwFC322VXPDQL165rF1y1qi2oCkVFokElPoNBEdEAv8BcDDCDqtM0sfOi60i42Q7vIWU0Jw== X-Received: by 2002:ac8:2aa4:: with SMTP id b33mr57422127qta.127.1555284672850; Sun, 14 Apr 2019 16:31:12 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id w68sm25142596qka.18.2019.04.14.16.31.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 16:31:12 -0700 (PDT) Date: Sun, 14 Apr 2019 19:31:10 -0400 Message-Id: <87lg0cnozl.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #35281 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 35281 by 35263 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 20:14:39 2019 Received: (at control) by debbugs.gnu.org; 15 Apr 2019 00:14:39 +0000 Received: from localhost ([127.0.0.1]:33396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpGh-0005dx-4i for submit@debbugs.gnu.org; Sun, 14 Apr 2019 20:14:39 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:45560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFpGf-0005dk-ET for control@debbugs.gnu.org; Sun, 14 Apr 2019 20:14:37 -0400 Received: by mail-qt1-f175.google.com with SMTP id v20so17218376qtv.12 for ; Sun, 14 Apr 2019 17:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=MMmWPkB9ycWzZiYqHmLvyVlgTR1lINFtN9qeoEITz0c=; b=sjiCm7ZbwIEbIrlANtE6y210OKIKdfOojIzBEZlTrX1iv9Btx6d5f+XhY7koqiQDJP XS2J+AbdGRPEMb+IJtgJR/ywQgdQGWOeWC6iiyeFxh8fXs2Z61pziCO7AIeqc6Xbh4Pk AI5hEJe/57mmE5TbkhpXy65JVwTdJvQ77GasVCCwcdfQAf/J1cGTNqya/1kp4wRuf4zH qOhmwoTQfA2XGSmD6FtAfEai190Ghq/0oZXPjFfjOlwo7yCeW8acEjse7jICvVZreBFL aLKSvIWmVQJcTngKAWeYGdctBxeMlgUK2FhDbptcKYKC7N3k5pFPHkL23OFbG6lxhrcK 3nJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=MMmWPkB9ycWzZiYqHmLvyVlgTR1lINFtN9qeoEITz0c=; b=eN+j7rsSAYRbtqJ4aVHQww0Gh8bFQK5SqT3mtDzm4xSW8SFrhha+wyk+oshxJwHOVL a8MZ/0BnfuJw/+ltauODqFtee9RZwO9gI480nAVglCl3RtoP3n2jm26avSjjcQH0eAM3 NUe7fjkMRvBVYU5atrg9yRjFN7y/bWksTKEgCNy5m8BIhIIpG1vlRmGPSji9Kcflo7ge mv8Bpg8sPhl1tlJrlmV6pjp2PO7GIaJFlHAK0v51Th3AS7WSvceYokv9xCNccVAl5kKH lQE3M9ONQQ+uRsZ8H38hp8fTna2WzBxR/k5GxZZHwd7yl2gwQP+wLbYsVSLeMsdPeAGv nDQQ== X-Gm-Message-State: APjAAAWrWPiu3yRpcEj/SWmrZlu8NA2aB3765PSa/LT+FTWMR8SV0Q9T MyxDTsSn8IHovwuO0g3GvrBfVKb4 X-Google-Smtp-Source: APXvYqzoB106t7ypPIjIRI22OAGU7rwEsnQm+efwpt18hnov8Vx7/8ApaLfDPqqHH88X2bMwg3cM6A== X-Received: by 2002:aed:3948:: with SMTP id l66mr57306911qte.309.1555287271865; Sun, 14 Apr 2019 17:14:31 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id c84sm27666312qke.0.2019.04.14.17.14.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 17:14:31 -0700 (PDT) Date: Sun, 14 Apr 2019 20:14:30 -0400 Message-Id: <87ftqknmzd.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #35282 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) block 35282 by 35281 From unknown Tue Aug 19 14:22:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#35281] [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2019 06:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35281 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 35281@debbugs.gnu.org Received: via spool by 35281-submit@debbugs.gnu.org id=B35281.155530935332151 (code B ref 35281); Mon, 15 Apr 2019 06:23:02 +0000 Received: (at 35281) by debbugs.gnu.org; 15 Apr 2019 06:22:33 +0000 Received: from localhost ([127.0.0.1]:33637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFv0j-0008MV-JU for submit@debbugs.gnu.org; Mon, 15 Apr 2019 02:22:33 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:35324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFv0h-0008MM-P0 for 35281@debbugs.gnu.org; Mon, 15 Apr 2019 02:22:32 -0400 Received: from localhost (188-22-89-123.adsl.highway.telekom.at [188.22.89.123]) by dd26836.kasserver.com (Postfix) with ESMTPSA id EBDDF336037E; Mon, 15 Apr 2019 08:22:29 +0200 (CEST) Date: Mon, 15 Apr 2019 08:22:26 +0200 From: Danny Milosavljevic Message-ID: <20190415082226.03761fcc@scratchpost.org> In-Reply-To: <87muksnqaq.fsf@gmail.com> References: <87muksnqaq.fsf@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/V6oubOn6bPZ1=ygFjMkjFaD"; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/V6oubOn6bPZ1=ygFjMkjFaD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, On Sun, 14 Apr 2019 19:02:53 -0400 Maxim Cournoyer wrote: > + ;; The tests fail with the error: > + ;; src/github.com/docker/libnetwork/network.go:1057: Warnf form= at %q > + ;; has arg n.configOnly of wrong type bool. > + #:tests? #f)) > + (home-page "https://github.com/docker/libnetwork/") It might make sense to report that bug upstream--they're helpful people. Otherwise LGTM! --Sig_/V6oubOn6bPZ1=ygFjMkjFaD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAly0IyIACgkQ5xo1VCww uqWh7Qf+JkEek8eDAupzlp9UsYxxJT+EwNpKtY5drnKSnyP0+r57PZ8BF0r35Z/g NRYUnXPrsnKliZopZvsbZPpK7KGYmtpF6QB8bQG3nko8vPaIt96ooTcsmu1gXxkP WWHS2oHA8+GdXjPZB5dunNvzO0gSANwYHnxEy2dmJ1GZFC/W9S/5/8ZRBY3pkP/0 llql182r9dr5x1Hqvqm56OVLKv4P1UNK/LPXdbXlyC9ct/hBmLbqsUagqCnOpnHw 9O7BEhZIEYV5Y7S0fqmU5L4GBJTLVdeco+QodO9ba5gnI+4yNbhwAzKSumPIcsBj VhRfnUDQ+3crAQtvjs8HqUQpHeFmFA== =GpUM -----END PGP SIGNATURE----- --Sig_/V6oubOn6bPZ1=ygFjMkjFaD-- From unknown Tue Aug 19 14:22:38 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#35281] [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2019 22:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35281 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Cc: 35281@debbugs.gnu.org Received: via spool by 35281-submit@debbugs.gnu.org id=B35281.155536647624816 (code B ref 35281); Mon, 15 Apr 2019 22:15:01 +0000 Received: (at 35281) by debbugs.gnu.org; 15 Apr 2019 22:14:36 +0000 Received: from localhost ([127.0.0.1]:35686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG9s4-0006SC-Is for submit@debbugs.gnu.org; Mon, 15 Apr 2019 18:14:36 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:35833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG9s2-0006Rw-Nx for 35281@debbugs.gnu.org; Mon, 15 Apr 2019 18:14:35 -0400 Received: by mail-qt1-f194.google.com with SMTP id h39so21147345qte.2 for <35281@debbugs.gnu.org>; Mon, 15 Apr 2019 15:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=VfCFD1o3hLXKtrSheKZPiRt5VPG6kw5JeQpDKm7RzKY=; b=fDTx1psuqWIxMtQ1noj9iGt/RaAJbkL3rr2XW8bvyRr2R/mnhoHtSqo69lwgIaooAP tR+TNzkF3ops6h8JoiG5uI2MSWMi4rDMB95JeGVtcOJj0Jkr6ldwHcTHAkeFIojrn4BI ZI2KkngaXgD3RJ7BtH03dr88sT8RtyvIrGdKU1SDRqydGGEkPCXUjMa6cBSLk8mNU7MU zrJ+aN1baBaZ1gYwKH5e5+8hU3Z1lL2ewn/EL48T6c5aIbO+ZbSKnMGwFyOHwa14Df3O 6Qbg5JAB21SGkWJU3WuKlD5uSczNkXnI3McxYvjJKSTYiyU3bpcvaRlcih6OJWDK+Vlh bwEw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=VfCFD1o3hLXKtrSheKZPiRt5VPG6kw5JeQpDKm7RzKY=; b=Bxl2N22psYOuXi+PhhRYFYYILXFnUx9JHOcll5pCAhBPpwB6IiZHwzzThp4PIDrEvd FnPAdMf3Y+7iDyraoNSPkQhUvVxcZ0H9enoYkMpKwdCUO7PCv8xO1gQLID/1bz2QTGoE SoCLULxl9uQELOteDT6T8o6xNmxMasZSprqpP2uak4oQNQSl6uXQQSSQsibjDLxT0ei1 alnrl4eDus7JYm+DcDnuxdkzWli1BAWf+CMQ/7Uy1nip1v2/zqv7JYoWhldHsxkN/xmu NEw5+V1asyoWbRwg75VT8RMUBhCev0ReXs8Miwspbpa2wW+YPvNvGKRCMkBYkXPBdozK qQQw== X-Gm-Message-State: APjAAAUzXQXVT8thZWR/vTPDOmicxZNqod3SLn7xaZqMCgrVs8+XamF5 8ju7ukHGFAXLvEr9VTzazknSHlpr X-Google-Smtp-Source: APXvYqxXPR5C/J8YZgkdX/NlnpMoNd1d81xSm8gdRPopGZpj8Sq1tfezTqJV1xf7w6wQw8/fNdcz2A== X-Received: by 2002:ac8:44c3:: with SMTP id b3mr59770053qto.349.1555366468006; Mon, 15 Apr 2019 15:14:28 -0700 (PDT) Received: from kwak (dsl-158-139.b2b2c.ca. [66.158.158.139]) by smtp.gmail.com with ESMTPSA id k4sm23292277qki.15.2019.04.15.15.14.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 15:14:27 -0700 (PDT) From: Maxim Cournoyer References: <87muksnqaq.fsf@gmail.com> <20190415082226.03761fcc@scratchpost.org> Date: Mon, 15 Apr 2019 18:14:25 -0400 In-Reply-To: <20190415082226.03761fcc@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 08:22:26 +0200") Message-ID: <877ebuncfy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Danny! Danny Milosavljevic writes: > Hi, > > On Sun, 14 Apr 2019 19:02:53 -0400 > Maxim Cournoyer wrote: > >> + ;; The tests fail with the error: >> + ;; src/github.com/docker/libnetwork/network.go:1057: Warnf format %q >> + ;; has arg n.configOnly of wrong type bool. >> + #:tests? #f)) >> + (home-page "https://github.com/docker/libnetwork/") > > It might make sense to report that bug upstream--they're helpful people. > > Otherwise LGTM! Thanks for bringing my attention to that part; I've tried re-enabling the tests but it seems to fail because of unmet dependencies now -- which makes sense since I'm not adding any inputs. I've removed the tests? #f argument and detailed in the top comment that this is simply used as a template and doesn't even build. Thanks for the review! Maxim From unknown Tue Aug 19 14:22:38 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#35281: closed (Re: [bug#35281] [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy.) Message-ID: References: <87tve8ctrq.fsf@kwak.i-did-not-set--mail-host-address--so-tickle-me> <87muksnqaq.fsf@gmail.com> X-Gnu-PR-Message: they-closed 35281 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 35281@debbugs.gnu.org Date: Mon, 06 May 2019 00:27:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1557102422-28413-1" This is a multi-part message in MIME format... ------------=_1557102422-28413-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #35281: [PATCH] gnu: docker: Add a couple go dependencies and enable docker= -proxy. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 35281@debbugs.gnu.org. --=20 35281: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35281 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1557102422-28413-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 35281-done) by debbugs.gnu.org; 6 May 2019 00:26:59 +0000 Received: from localhost ([127.0.0.1]:55260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNRT9-0007O1-8q for submit@debbugs.gnu.org; Sun, 05 May 2019 20:26:59 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:45263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hNRT7-0007Nn-Bu for 35281-done@debbugs.gnu.org; Sun, 05 May 2019 20:26:57 -0400 Received: by mail-qk1-f196.google.com with SMTP id j1so1046792qkk.12 for <35281-done@debbugs.gnu.org>; Sun, 05 May 2019 17:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=OzZpVIxJug6MY5pxo6Sdy/7DfhcNeMwG27WGod7qrTg=; b=K1woIHh1thFlW8iMg5Elayhm7MQd1/cAqry2VioNoKRg1ZFTFhkvII08ae6hwqQyhB wYSaOwjpzuM7WN5WIsU/YVWXqbI3XH5P+5h9DpH1m6C+8XVBAlcvsQdN5QF2ttJGnzFq RTaegPnEOQKwks+EImKgDYaYkOMqk6dZRLj7nvPBNanLexazlG2UYLe1LGZNyMJ2hXA9 btF0XDXNYrQgiwpsUCcnFNXd1xNKo5X6kiXa6B600oJBUTYQgJ2rg44WS3y/GKL77GT3 gww+Rus7AaR7ossdLCozoAD+U6SwKEASCc75aMO22zqHNzstnH30mGW3xHTbcfdRYvrX UJyA== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=OzZpVIxJug6MY5pxo6Sdy/7DfhcNeMwG27WGod7qrTg=; b=G4ib9V10VMSESUOIh9I36/OODIV2RHSqRmcMDu5AZVaLwU4Eq94t+xkmQtsYVvVez7 SMttMRS+reIIWxZnvv2ima46RbSWsQwCWhTnJyBjauWrlB3E+CwtFcOVZINENCZpyKP9 p4k25SrCp0UajfNh2nlV/MKI5WaTrP97iR1S4CCdxQ3e+VXAotWePRfcYFvzN3lyTEJD ixpdgcJg5KS2YWA7mn3lQXZ+NmdRetIS9sxQXhG/Wd1WTjySM+aeFqN6/MVtTpV+3+KE HMK79xyzdTJV1+dIhxWwEfpnXV15aVYVyqoZWTIhi3iBbHhikcbeL8atXdE7eq4lhLei qNXQ== X-Gm-Message-State: APjAAAUfANCx5CbqSew8SXWCQfE8AOsVKbpAl+E72AvPnshG/yTVUVDI eDBgZil8Bcp3mjvEKlY/jKLLwCMTxwM= X-Google-Smtp-Source: APXvYqyNIl50MBnSSO9pGINUeGFr978TgCNxAPDUYbSunITyIxwpLVZPd8/pPZKTKjetVo9Z0kr7fw== X-Received: by 2002:a37:e307:: with SMTP id y7mr17844010qki.36.1557102411768; Sun, 05 May 2019 17:26:51 -0700 (PDT) Received: from kwak (dsl-205-236-230-39.b2b2c.ca. [205.236.230.39]) by smtp.gmail.com with ESMTPSA id d1sm3341153qkj.7.2019.05.05.17.26.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 May 2019 17:26:51 -0700 (PDT) From: T460s laptop X-Google-Original-From: T460s laptop To: 35281-done@debbugs.gnu.org Subject: Re: [bug#35281] [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy. References: <87muksnqaq.fsf@gmail.com> <20190415082226.03761fcc@scratchpost.org> <877ebuncfy.fsf@gmail.com> Date: Sun, 05 May 2019 20:26:49 -0400 In-Reply-To: <877ebuncfy.fsf@gmail.com> (Maxim Cournoyer's message of "Mon, 15 Apr 2019 18:14:25 -0400") Message-ID: <87tve8ctrq.fsf@kwak.i-did-not-set--mail-host-address--so-tickle-me> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35281-done Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Maxim Cournoyer writes: > Hi Danny! > > Danny Milosavljevic writes: > >> Hi, >> >> On Sun, 14 Apr 2019 19:02:53 -0400 >> Maxim Cournoyer wrote: >> >>> + ;; The tests fail with the error: >>> + ;; src/github.com/docker/libnetwork/network.go:1057: Warnf format %q >>> + ;; has arg n.configOnly of wrong type bool. >>> + #:tests? #f)) >>> + (home-page "https://github.com/docker/libnetwork/") >> >> It might make sense to report that bug upstream--they're helpful people. >> >> Otherwise LGTM! > > Thanks for bringing my attention to that part; I've tried re-enabling > the tests but it seems to fail because of unmet dependencies now -- > which makes sense since I'm not adding any inputs. I've removed the > tests? #f argument and detailed in the top comment that this is simply > used as a template and doesn't even build. > > Thanks for the review! > > Maxim Pushed as 7a31d93a61. Thanks! Maxim ------------=_1557102422-28413-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 14 Apr 2019 23:11:56 +0000 Received: from localhost ([127.0.0.1]:33295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoHv-0008MX-H8 for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hFoHt-0008MJ-2N for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:53293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hFoHm-0005Z8-GQ for submit@debbugs.gnu.org; Sun, 14 Apr 2019 19:11:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFoHk-0006v7-09 for guix-patches@gnu.org; Sun, 14 Apr 2019 19:11:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hFo9L-000855-O1 for guix-patches@gnu.org; Sun, 14 Apr 2019 19:03:01 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:42840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hFo9L-00084O-0G for guix-patches@gnu.org; Sun, 14 Apr 2019 19:02:59 -0400 Received: by mail-qt1-x832.google.com with SMTP id p20so17135523qtc.9 for ; Sun, 14 Apr 2019 16:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=uFeN9Nl1N7BO9beJ5SsuKaiIhNG6723feJ6tCjPi9yg=; b=EUfkKzdtuW2haSv1vtQzHZDMUW7bCMKkDCPNJldEpsMBFIUC82S7LsnlN3E0p7Vg3s C5gxQZ4ELCJvOWoKok5QocVhQadbw/3g7M3IL+8EwxTL7dryVnNsCIQkS7vZ/3jDdQ43 al+o8O/4dhsL4oU3qnd7HRVd7rGu83YLuwpMn+/KB3+c8FMJwoR1Po6wtEQvI+r459hI WPZRMQ7dZN6RVNTdrxIEfSpvW40ii3r4h0Wp3iTxlZiuDFLmIG9pEMFs/Z7g5u1AalCq OVW7ALM+0DlviAqwXnB2JaL5K0+YXqg3B/VEcJ/fT+y8LSoAfLLlzuUTx+bu8acsHHGn 6sJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=uFeN9Nl1N7BO9beJ5SsuKaiIhNG6723feJ6tCjPi9yg=; b=gnn8X0NIq9E7BwohHn56BBkqA7sn2C4M06sSSo/QqvXI6sO+/HSDrBfLAVGIV37chb fUVUjrrU2RaFKzotxoxPQy0iplsXXqf2IbducfeK1KlFmary39NV/kSJgNrofYGsujsQ VbO1EnnTB2RJFWvxBX836wGAaoB0ci1pOEqPy4azVhN55LJH8okkC0h0tlkDiBOdEg6T LDV4hdUr6MrtOhjwKRf7aKVyXCWQIsrUUP0ayBCeuEUNNzX69OfojuRCAS4P49tYqfM3 4vBUwjeWzP+x+flMmC5o39YOOFrzrVtqz1pAG2Orb3vEmlQXF91q/pIbPctVyId9tX9x rJcg== X-Gm-Message-State: APjAAAXALdLN9pmLefrEtpgz5+qyRxXrSVaf56IAQZq++IGeENHLbpDt tWduwUspD5UOAkZkz0/YDT1TZ9l1 X-Google-Smtp-Source: APXvYqy0CldgXR7yz2QwkJ/c5q1bmJa421pEjebrhF5j0SaS7RUYN3Lj+15VG7WbsIcdzFRJ5xwZAw== X-Received: by 2002:ac8:72cb:: with SMTP id o11mr53574683qtp.84.1555282978068; Sun, 14 Apr 2019 16:02:58 -0700 (PDT) Received: from kwak (dsl-10-136-224.b2b2c.ca. [72.10.136.224]) by smtp.gmail.com with ESMTPSA id r31sm28172903qtj.17.2019.04.14.16.02.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 14 Apr 2019 16:02:56 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: [PATCH] gnu: docker: Add a couple go dependencies and enable docker-proxy. Date: Sun, 14 Apr 2019 19:02:53 -0400 Message-ID: <87muksnqaq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::832 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello Guix! Before this change, attempting to start a docker registry such as with the following command[0]: --8<---------------cut here---------------start------------->8--- docker run -d -p 5000:5000 --restart=always --name registry registry:2 --8<---------------cut here---------------end--------------->8--- Would give the following error: --8<---------------cut here---------------start------------->8--- /gnu/store/dzaijl53fcd3jhkpd70vsf4cnvv10ywj-docker-cli-18.09.3/bin/docker: Error response from daemon: driver failed programming external connectivity on endpoint registry (709754084a9e208c32075e47ea9584296a6f274deeef08283d0de9c9a5161112): exec: "docker-proxy": executable file not found in $PATH. --8<---------------cut here---------------end--------------->8--- This series of patches adds docker-libnetwork-cmd-proxy and a few new go packages it required. The docker service is modified to enable (or disable) using a 'docker-proxy'. Thanks! Maxim --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-go-sctp.patch Content-Transfer-Encoding: quoted-printable From=202e46dd6c449679ecae6a13a7a922eaf6b6947164 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:07:58 -0400 Subject: [PATCH 1/6] gnu: Add go-sctp. * gnu/packages/networking.scm (go-sctp): New variable. =2D-- gnu/packages/networking.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 46aed1e549..5163726393 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,6 +26,7 @@ ;;; Copyright =C2=A9 2018 Marius Bakke ;;; Copyright =C2=A9 2018 Oleg Pykhalov ;;; Copyright =C2=A9 2018 Pierre Neidhardt +;;; Copyright =C2=A9 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -730,6 +732,31 @@ manage, and delete Internet resources from Gandi.net s= uch as domain names, virtual machines, and certificates.") (license license:gpl3+))) =20 +(define-public go-sctp + ;; docker-libnetwork-cmd-proxy requires this exact commit. + (let ((commit "07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb") + (revision "1")) + (package + (name "go-sctp") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ishidawataru/sctp.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mk9ncm10gwi5pn5wcw4skbyf4qg7n5qdf1mim4gf3mrckvi6g6h"))= )) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/ishidawataru/sctp")) + (home-page "https://github.com/ishidawataru/sctp") + (synopsis "SCTP library for the Go programming language") + (description "This library provides methods for using the stream con= trol +transmission protocol (SCTP) in a Go application.") + (license license:asl2.0)))) + (define-public httping (package (name "httping") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-go-netns.patch Content-Transfer-Encoding: quoted-printable From=200081c4231f9e25879c287fca54ec9db4929d1711 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:53:00 -0400 Subject: [PATCH 2/6] gnu: Add go-netns. * gnu/packages/networking.scm (go-netns): New variable. =2D-- gnu/packages/networking.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5163726393..1407f6208e 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -732,6 +732,31 @@ manage, and delete Internet resources from Gandi.net s= uch as domain names, virtual machines, and certificates.") (license license:gpl3+))) =20 +(define-public go-netns + (let ((commit "13995c7128ccc8e51e9a6bd2b551020a27180abd") + (revision "1")) + (package + (name "go-netns") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netns.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"))= )) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netns" + #:tests? #f)) ;tests require root privileges + (home-page "https://github.com/vishvananda/netns") + (synopsis "Simple network namespace handling for Go") + (description "The netns package provides a simple interface for +handling network namespaces in Go.") + (license license:asl2.0)))) + (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. (let ((commit "07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-Add-go-netlink.patch Content-Transfer-Encoding: quoted-printable From=202a8b23da6fe7ef09f0931231c67f25cd4c60f24f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 01:57:44 -0400 Subject: [PATCH 3/6] gnu: Add go-netlink. * gnu/packages/linux.scm (go-netlink): New variable. =2D-- gnu/packages/linux.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e8ee4df4f3..c8adf52ff8 100644 =2D-- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -33,6 +33,7 @@ ;;; Copyright =C2=A9 2018 Pierre Langlois ;;; Copyright =C2=A9 2018 Vasile Dumitrascu ;;; Copyright =C2=A9 2019 Tim Gesthuizen +;;; Copyright =C2=A9 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libunwind) @@ -116,6 +118,7 @@ #:use-module (gnu packages swig) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -5151,6 +5154,33 @@ nfnetlink_queue, nfnetlink_conntrack) and their resp= ective users and/or management tools in userspace.") (license license:gpl2))) =20 +(define-public go-netlink + (package + (name "go-netlink") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vishvananda/netlink.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/vishvananda/netlink")) + (native-inputs + `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix) + ("go-netns" ,go-netns))) + (home-page "https://github.com/vishvananda/netlink") + (synopsis "Simple netlink library for Go") + (description "The netlink package provides a simple netlink library for +Go. Netlink is the interface a user-space program in Linux uses to +communicate with the kernel. It can be used to add and remove interfaces,= set +IP addresses and routes, and configure IPsec.") + (license license:asl2.0))) + (define-public xfsprogs (package (name "xfsprogs") =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-Add-docker-libnetwork.patch Content-Transfer-Encoding: quoted-printable From=20721d1a93961bf653a02cccdbfaf92e0514a3ae59 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:32:40 -0400 Subject: [PATCH 4/6] gnu: Add docker-libnetwork. * gnu/packages/docker.scm (docker-libnetwork): New private variable. =2D-- gnu/packages/docker.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a11ce266d2..df0bbca1bc 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -227,6 +227,47 @@ network attachments.") (home-page "http://containerd.io/") (license license:asl2.0))) =20 +;;; Private package that shouldn't be used directly; its purposes is to be= used +;;; as a template for the various packages it contains. +(define docker-libnetwork + ;; There are no recent release for libnetwork, so choose the last commit= of + ;; the branch that Docker uses, as can be seen in the Docker source file + ;; 'hack/dockerfile/install/proxy.installer'. + (let ((commit "4725f2163fb214a6312f3beae5991f838ec36326") + (version "18.09") + (revision "1")) + (package + (name "docker-libnetwork") + (version (git-version version "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/libnetwork.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zpnxki8qfzha6ljahpwd3vkzmjhsvkmf73w6crm4ilxxw5vnpfb")) + ;; Delete bundled ("vendored") free software source code. + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/docker/libnetwork/" + ;; The tests fail with the error: + ;; src/github.com/docker/libnetwork/network.go:1057: Warnf format= %q + ;; has arg n.configOnly of wrong type bool. + #:tests? #f)) + (home-page "https://github.com/docker/libnetwork/") + (synopsis "Networking for containers") + (description "Libnetwork provides a native Go implementation for +connecting containers. The goal of @code{libnetwork} is to deliver a robu= st +container network model that provides a consistent programming interface a= nd +the required network abstractions for applications.") + (license license:asl2.0)))) + ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, ;; brige, nf_conntrack_netlink, aufs. (define-public docker =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-Add-docker-libnetwork-cmd-proxy.patch Content-Transfer-Encoding: quoted-printable From=20843ecd2ff5aa5f69ea8a83f2da8e0d783be4b36a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:33:38 -0400 Subject: [PATCH 5/6] gnu: Add docker-libnetwork-cmd-proxy. * gnu/packages/docker.scm (docker-libnetwork-cmd-proxy): New variable. =2D-- gnu/packages/docker.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index df0bbca1bc..1067555296 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages golang) #:use-module (gnu packages linux) + #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-web) @@ -268,6 +269,28 @@ container network model that provides a consistent pro= gramming interface and the required network abstractions for applications.") (license license:asl2.0)))) =20 +(define-public docker-libnetwork-cmd-proxy + (package + (inherit docker-libnetwork) + (name "docker-libnetwork-cmd-proxy") + (arguments + `(#:import-path "github.com/docker/libnetwork/cmd/proxy" + #:unpack-path "github.com/docker/libnetwork" + #:install-source? #f)) + (native-inputs + `(("go-sctp" ,go-sctp) + ;; For tests. + ("logrus" ,go-github-com-sirupsen-logrus) + ("go-netlink" ,go-netlink) + ("go-netns" ,go-netns) + ("go-golang-org-x-crypto-ssh-terminal" + ,go-golang-org-x-crypto-ssh-terminal) + ("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix))) + (synopsis "Docker user-space proxy") + (description "A proxy running in the user space. It is used by the +built-in registry server of Docker.") + (license license:asl2.0))) + ;; TODO: Patch out modprobes for ip_vs, nf_conntrack, ;; brige, nf_conntrack_netlink, aufs. (define-public docker =2D-=20 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-services-docker-Add-new-fields-to-support-proxy.patch Content-Transfer-Encoding: quoted-printable From=20fd1003dc333ede95a8fa2813b7e8ab2f6cfe82d2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Apr 2019 02:34:16 -0400 Subject: [PATCH 6/6] services: docker: Add new fields to support proxy. The Docker proxy enables inter-container and outside-to-container loopback, and is required by the Docker registry server. * gnu/services/docker.scm (docker-configuration)[proxy, enable-proxy?]: Add fields. (docker-shepherd-service): Use them. (serialize-boolean): New function. =2D-- gnu/services/docker.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 8b5edf5cb0..94a04c8996 100644 =2D-- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -31,13 +31,25 @@ #:export (docker-configuration docker-service-type)) =20 +;;; We're not using serialize-configuration, but we must define this becau= se +;;; the define-configuration macro validates it exists. +(define (serialize-boolean field-name val) + "") + (define-configuration docker-configuration (docker (package docker) "Docker daemon package.") (containerd (package containerd) =2D "containerd package.")) + "containerd package.") + (proxy + (package docker-libnetwork-cmd-proxy) + "The proxy package to support inter-container and outside-container +loop-back communications.") + (enable-proxy? + (boolean #t) + "Enable or disable the user-land proxy (enabled by default).")) =20 (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -66,7 +78,9 @@ (stop #~(make-kill-destructor))))) =20 (define (docker-shepherd-service config) =2D (let* ((docker (docker-configuration-docker config))) + (let* ((docker (docker-configuration-docker config)) + (enable-proxy? (docker-configuration-enable-proxy? config)) + (proxy (docker-configuration-proxy config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -83,7 +97,10 @@ udev)) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") =2D "-p" "/var/run/docker.pid") + "-p" "/var/run/docker.pid" + (if #$enable-proxy? "--userland-proxy" "") + "--userland-proxy-path" (string-append #$proxy + "/bin/pr= oxy")) #:pid-file "/var/run/docker.pid" #:log-file "/var/log/docker.log")) (stop #~(make-kill-destructor))))) =2D-=20 2.20.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAlyzvB0ACgkQEmDkZILm NWKluxAAkXmqru8+EbF9ZMugp9aiZd3GlGWnGl/p/Y3qohkry0rvepGGeLP+RXxY MtEEiryKXN/qDi5GMfyKkTigreJ5UVAPLGIM3QRhSfd1r6LDWLMJuatjS8FZ0xdC fh+tg4TdnqMhwWqASlIOpYb9AE9neidU6VjycPshjyVaHjJ/1rqPgcJAPBO8bPGz bkskq0RuINhD1wcVidayEsqssiPJ2IgwYgxwWeArNuARJphdmzfEXinaU0PJqIyQ hNB43VoBP3aGEJ+rmhChzoJAVLpj/yD1Iw+yr0MjD92nj+8iPpyBTMi78xJlV8dp 6kvyjHbX+8QESVfNXTToYofcITWs7HJfFcqYdxDUEYMwfCxaK8VjJhfsImgjqdWd X3m7jT6FZHRfeDH26NnGR/a1asQ4ZNEdog1foK0F+L54cWh2a82moyjQJ1ceDCw+ 4RNGhpJPcKFjl70Kv/0T+46jCewlmdwgZ7tfiq4BWoc3wE57dIq+5gYbZLqboeUU kh2+KeGWBrPVn1CxworWvEM8iz+KnSS442Xl5aoAxM64c2UQEGgHA5A+SuzKshB/ +UgrE7sc9sMjlTsvQRAkSA1sSely0mqWcSLLZ7YGnoK8NdjZqZzR1AzNJjF86nLD gCOk3oBeUjPah5Rvg5kJ+j7U0H2zs0ENsVJh8TTMHmVgL3jzU3o= =vMxW -----END PGP SIGNATURE----- --==-=-=-- ------------=_1557102422-28413-1--