unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 33893@debbugs.gnu.org
Subject: [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine.
Date: Mon, 7 Jan 2019 19:44:55 +0100	[thread overview]
Message-ID: <20190107194455.69823f82@scratchpost.org> (raw)
In-Reply-To: <87pnt9y1v0.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 2505 bytes --]

Hi Ludo,

On Sun, 06 Jan 2019 21:20:35 +0100
Ludovic Courtès <ludo@gnu.org> wrote:

> 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?

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-version))
> > +             (setenv "AUTO_GOPATH" "1")  
> 
> 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'  
> 
> It’s 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))  
> 
> That’s potentially problematic.  :-)  Any idea how difficult it would 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-bin)
> > +               (install-file "bundles/dynbinary-daemon/dockerd-dev" out-bin))
> > +             ;(setenv "DOCKER_MAKE_INSTALL_PREFIX" (assoc-ref outputs "out"))
> > +             ; TODO: KEEPBUNDLE=1
> > +             ;./source/bundles/dynbinary-daemon/dockerd
> > +             ;(invoke "hack/make.sh" "install-binary")  
> 
> Comments can be removed?

Yeah.

Thanks!

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2019-01-07 18:46 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-28 10:13 [bug#33893] [PATCH 0/2] Add docker Danny Milosavljevic
2018-12-28 10:17 ` [bug#33893] [PATCH 1/2] gnu: Add docker-engine Danny Milosavljevic
2018-12-28 10:17   ` [bug#33893] [PATCH 2/2] gnu: Add docker-cli Danny Milosavljevic
2018-12-29  1:32 ` [bug#33893] [PATCH v2 0/3] Add docker Danny Milosavljevic
2018-12-29  1:32   ` [bug#33893] [PATCH v2 1/3] gnu: Add containerd Danny Milosavljevic
2018-12-29  1:32   ` [bug#33893] [PATCH v2 2/3] gnu: Add docker-engine Danny Milosavljevic
2018-12-29  1:32   ` [bug#33893] [PATCH v2 3/3] services: Add docker Danny Milosavljevic
2018-12-29  1:39   ` [bug#33893] [PATCH v3 0/4] " Danny Milosavljevic
2018-12-29  1:39     ` [bug#33893] [PATCH v3 1/4] gnu: Add containerd Danny Milosavljevic
2018-12-29  1:39     ` [bug#33893] [PATCH v3 2/4] gnu: Add docker-engine Danny Milosavljevic
2018-12-29  1:39     ` [bug#33893] [PATCH v3 3/4] services: Add docker Danny Milosavljevic
2018-12-30  9:50       ` Danny Milosavljevic
2018-12-29  1:39     ` [bug#33893] [PATCH v3 4/4] gnu: Add docker-cli Danny Milosavljevic
2018-12-30 12:17     ` [bug#33893] [PATCH v4 0/4] Add docker Danny Milosavljevic
2018-12-30 12:17       ` [bug#33893] [PATCH v4 1/4] gnu: Add containerd Danny Milosavljevic
2018-12-30 12:17       ` [bug#33893] [PATCH v4 2/4] gnu: Add docker-engine Danny Milosavljevic
2018-12-30 12:17       ` [bug#33893] [PATCH v4 3/4] services: Add docker Danny Milosavljevic
2018-12-30 12:17       ` [bug#33893] [PATCH v4 4/4] gnu: Add docker-cli Danny Milosavljevic
2018-12-30 23:38       ` [bug#33893] [PATCH v5 0/4] Add docker Danny Milosavljevic
2018-12-30 23:39         ` [bug#33893] [PATCH v5 1/4] gnu: Add containerd Danny Milosavljevic
2019-01-06 20:14           ` Ludovic Courtès
2018-12-30 23:39         ` [bug#33893] [PATCH v5 2/4] gnu: Add docker-engine Danny Milosavljevic
2019-01-06 20:20           ` Ludovic Courtès
2019-01-07 18:44             ` Danny Milosavljevic [this message]
2019-01-08  8:42               ` Ludovic Courtès
2019-01-10  2:22                 ` Danny Milosavljevic
2019-01-10  8:50                   ` bug#33893: " Ludovic Courtès
2019-01-10 13:15                     ` [bug#33893] " Danny Milosavljevic
2019-01-10 20:31                   ` Leo Famulari
2018-12-30 23:39         ` [bug#33893] [PATCH v5 3/4] services: Add docker Danny Milosavljevic
2019-01-06 20:31           ` Ludovic Courtès
2018-12-30 23:39         ` [bug#33893] [PATCH v5 4/4] gnu: Add docker-cli Danny Milosavljevic
2019-01-06 20:33           ` Ludovic Courtès
2019-01-14  3:20             ` Meiyo Peng
2019-01-15 12:34               ` Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190107194455.69823f82@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=33893@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).