From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:45837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggZuV-0007vQ-VZ for guix-patches@gnu.org; Mon, 07 Jan 2019 13:46:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggZuV-00055M-4i for guix-patches@gnu.org; Mon, 07 Jan 2019 13:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggZuV-00054v-0d for guix-patches@gnu.org; Mon, 07 Jan 2019 13:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ggZuT-0003pF-Qg for guix-patches@gnu.org; Mon, 07 Jan 2019 13:46:01 -0500 Subject: [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine. Resent-Message-ID: Date: Mon, 7 Jan 2019 19:44:55 +0100 From: Danny Milosavljevic Message-ID: <20190107194455.69823f82@scratchpost.org> In-Reply-To: <87pnt9y1v0.fsf@gnu.org> References: <20181230121754.775-1-dannym@scratchpost.org> <20181230233903.23426-1-dannym@scratchpost.org> <20181230233903.23426-3-dannym@scratchpost.org> <87pnt9y1v0.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/S.8OBd/xNh0c1.Ea69VcqPK"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 33893@debbugs.gnu.org --Sig_/S.8OBd/xNh0c1.Ea69VcqPK Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, On Sun, 06 Jan 2019 21:20:35 +0100 Ludovic Court=C3=A8s wrote: > Danny Milosavljevic skribis: >=20 > > * gnu/packages/docker.scm (docker-engine): New variable. > > (%docker-version): New variable. =20 >=20 > [...] >=20 > > + ;(("LookPath") "Guix_doesnt_want_LookPath") =20 >=20 > No longer needed? It was meant as a detector in order to make compilation fail when, in future versions, docker wants to invok new stuff that we didn't patch yet. Should we do that? > > + (replace 'configure > > + (lambda _ > > + (setenv "DOCKER_GITCOMMIT" (string-append "v" ,%docker-ve= rsion)) > > + (setenv "AUTO_GOPATH" "1") =20 >=20 > Could you add a comment saying what AUTO_GOPATH does? Yes, I'll add one. > > + (replace 'build > > + (lambda _ > > + ;(invoke "hack/make.sh" "binary") > > + ; FIXME: bash -c 'hack/validate/default && hack/make.sh' = =20 >=20 > It=E2=80=99s not clear to me what should be fixed; perhaps a leftover? Yeah, I meant to check what hack/validate/default does and it seems to do developer-specific tests (commit message formatted the right way etc), so I guess we can just not invoke it. > > + (replace 'check > > + (lambda _ > > + ; FIXME: Those don't find any of the go packages > > + ; needed. Probably GOPATH/GOROOT related. > > + ;(invoke "hack/test/unit") > > + #t)) =20 >=20 > That=E2=80=99s potentially problematic. :-) Any idea how difficult it w= ould be > to run these tests? Go has peculiar ideas of how the directory layout is supposed to be set up. I could probably figure it out - but if someone with more Go knowledge could step forward it would be much faster. > > + (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-bi= n) > > + (install-file "bundles/dynbinary-daemon/dockerd-dev" ou= t-bin)) > > + ;(setenv "DOCKER_MAKE_INSTALL_PREFIX" (assoc-ref outputs = "out")) > > + ; TODO: KEEPBUNDLE=3D1 > > + ;./source/bundles/dynbinary-daemon/dockerd > > + ;(invoke "hack/make.sh" "install-binary") =20 >=20 > Comments can be removed? Yeah. Thanks! --Sig_/S.8OBd/xNh0c1.Ea69VcqPK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlwznicACgkQ5xo1VCww uqU13Qf/X56xpbhPZf+HKBrRgQgt5SI1yC7uMV3fpZERiApWi2xKq7Jask1JX25/ qENdd01e/7H8h/BbtiBRV7mFNtqMcHC7wmm3ntIRp/Mk4FwCU97oZ0jJlBvqhOxq 92/Lywb3m4OaVh+1P0OEmAU+jluER8i9zx4Gj9L8zl9XYnp3im5ZaZTdpwDvQzyF TM3eKc268RFHBiwi8djpOXLm7g7TKbW7voD78sRZDpFwIvv3fCl9uhpGCfMWjhPL jUfRmh52hxnyg41cJmBseIRzwE0vQRcdxVfx9rm0AFFZbmYqpq8tWx5odLl1Yz6y FyOTRyyhbXrV2OpdCBr3LpdW0aixlA== =MQVW -----END PGP SIGNATURE----- --Sig_/S.8OBd/xNh0c1.Ea69VcqPK--