From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggsout.gnu.org ([209.51.188.92]:33957 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ggEux-0007d7-WF
	for guix-patches@gnu.org; Sun, 06 Jan 2019 15:21:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ggEut-000321-1w
	for guix-patches@gnu.org; Sun, 06 Jan 2019 15:21:07 -0500
Received: from debbugsout.gnu.org ([209.51.188.43]:48242)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1ggEus-00030T-UU
	for guix-patches@gnu.org; Sun, 06 Jan 2019 15:21:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ggEus-0006HW-GT
	for guix-patches@gnu.org; Sun, 06 Jan 2019 15:21:02 -0500
Subject: [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine.
Resent-Message-ID: <handler.33893.B33893.154680603924091@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20181230121754.775-1-dannym@scratchpost.org>
	<20181230233903.23426-1-dannym@scratchpost.org>
	<20181230233903.23426-3-dannym@scratchpost.org>
Date: Sun, 06 Jan 2019 21:20:35 +0100
In-Reply-To: <20181230233903.23426-3-dannym@scratchpost.org> (Danny
	Milosavljevic's message of "Mon, 31 Dec 2018 00:39:01 +0100")
Message-ID: <87pnt9y1v0.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 33893@debbugs.gnu.org

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * gnu/packages/docker.scm (docker-engine): New variable.
> (%docker-version): New variable.

[...]

> +              ;(("LookPath") "Guix_doesnt_want_LookPath")

No longer needed?

> +         (replace 'configure
> +           (lambda _
> +             (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-vers=
ion))
> +             (setenv "AUTO_GOPATH" "1")

Could you add a comment saying what AUTO_GOPATH does?

> +         (replace 'build
> +           (lambda _
> +             ;(invoke "hack/make.sh" "binary")
> +             ; FIXME: bash -c 'hack/validate/default && hack/make.sh'

It=E2=80=99s not clear to me what should be fixed; perhaps a leftover?

> +         (replace 'check
> +           (lambda _
> +             ; FIXME: Those don't find any of the go packages
> +             ; needed.  Probably GOPATH/GOROOT related.
> +             ;(invoke "hack/test/unit")
> +             #t))

That=E2=80=99s potentially problematic.  :-)  Any idea how difficult it wou=
ld be
to run these tests?

> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (out-bin (string-append out "/bin")))
> +               (install-file "bundles/dynbinary-daemon/dockerd" out-bin)
> +               (install-file "bundles/dynbinary-daemon/dockerd-dev" out-=
bin))
> +             ;(setenv "DOCKER_MAKE_INSTALL_PREFIX" (assoc-ref outputs "o=
ut"))
> +             ; TODO: KEEPBUNDLE=3D1
> +             ;./source/bundles/dynbinary-daemon/dockerd
> +             ;(invoke "hack/make.sh" "install-binary")

Comments can be removed?

Otherwise LGTM, thanks!

Ludo=E2=80=99.