[PATCH 0/4] Update docker to 20.10.11.

Hi Guix!

Here's a series to update docker. My use of docker is quite limited so

we might want more testing, I just have a basic Ubuntu container.

Also, while looking into this I noticed containerd's patch-paths phase

wasn't running at all so I fixed that. However I'm not sure how

containerd worked before without it. Docker bundles its own

version that we also patch, so we're probably not hitting the code that

needed patching.

Thanks,

Pierre

Pierre Langlois (4):

gnu: containerd: Fix patch-paths build phase.

gnu: containerd: Update to 1.5.8.

gnu: runc: Update to 1.0.3.

gnu: docker: Update to 20.10.11.

gnu/local.mk | 1 -

gnu/packages/docker.scm | 80 +++++++++------------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 --------

gnu/packages/virtualization.scm | 4 +-

5 files changed, 39 insertions(+), 80 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

2.34.0

phases after 'unpack because 'chdir doesn't exist. Substitute runc

binary for "pkg/cri/config/config_unix.go".

---

gnu/packages/docker.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

--

2.34.0

[arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go".

---

gnu/packages/docker.scm | 9 +++++++--

1 file changed, 7 insertions(+), 2 deletions(-)

--

2.34.0

---

gnu/packages/virtualization.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

--

2.34.0

(docker-libnetwork): Update commit according to vendor.conf.

(docker)[origin]: Remove docker-fix-tests.patch.

[arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and

buildkit-qemu. Remove trailing #t.

[native-inputs]: Replace go-1.14 by go.

(docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t.

docker-libnetwork's vendor.conf.

---

gnu/local.mk | 1 -

gnu/packages/docker.scm | 69 ++++++++-------------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 ---------

4 files changed, 29 insertions(+), 75 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

-- client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

-+ client, err := plugins.NewClient("unix:///"+path.Join("/", pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

- if err != nil {

- t.Fatalf("Failed to create client %v", err)

- }

--

2.34.0

Hello Pierre,

Thanks for updating Docker. We have two system tests, that you can run

this way:

Mathieu

Hi,

Mathieu Othacehe <othacehe@gnu.org> writes:

Oh yeah of course! These tests pass for me with this series.

Thanks,

Pierre

---

gnu/packages/virtualization.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

--

2.34.0

Hi Guix!

I rebased this series, updated it to 20.10.14 and did a bit of spring gexp

cleanup. Tested manually with a simple Ubuntu container, and with

make check-system TESTS="docker docker-system"

I've seen reports of issues on help-guix that /look/ like patch number 2 might

fix it, so we could submit that first if the rest needs more work.

WDYT?

Thanks,

Pierre

Pierre Langlois (7):

gnu: runc: Update to 1.1.0.

gnu: containerd: Fix patch-paths build phase.

gnu: containerd: Update to 1.6.2.

gnu: containerd: Switch to gexp arguments.

gnu: docker: Fix mkfs.xfs reference.

gnu: docker: Update to 20.10.14.

gnu: docker: Switch to gexp and new input style.

gnu/local.mk | 1 -

gnu/packages/docker.scm | 625 ++++++++++----------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 -

gnu/packages/virtualization.scm | 6 +-

5 files changed, 314 insertions(+), 352 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

2.34.0

phases after 'unpack because 'chdir doesn't exist.

---

gnu/packages/docker.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

--

2.34.0

[arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". Set

PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX.

---

gnu/packages/docker.scm | 13 +++++++++----

1 file changed, 9 insertions(+), 4 deletions(-)

--

2.34.0

Pass all flags via make-flags variable. Switch to using

search-input-file.

---

gnu/packages/docker.scm | 95 +++++++++++++++++++++--------------------

1 file changed, 49 insertions(+), 46 deletions(-)

--

2.34.0

instead of bin/mkfs.xfs.

---

gnu/packages/docker.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

--

2.34.0

(docker-libnetwork): Update commit according to vendor.conf.

(docker)[origin]: Remove docker-fix-tests.patch.

[arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and

buildkit-qemu. Remove trailing #t.

[native-inputs]: Replace go-1.14 by go.

(docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t.

docker-libnetwork's vendor.conf.

---

gnu/local.mk | 1 -

gnu/packages/docker.scm | 69 ++++++++-------------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 ---------

4 files changed, 29 insertions(+), 75 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

-- client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

-+ client, err := plugins.NewClient("unix:///"+path.Join("/", pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

- if err != nil {

- t.Fatalf("Failed to create client %v", err)

- }

--

2.34.0

to using search-input-file.

[inputs]: Use new style inputs.

---

gnu/packages/docker.scm | 483 ++++++++++++++++++++--------------------

1 file changed, 241 insertions(+), 242 deletions(-)

Pierre Langlois <pierre.langlois@gmx.com> writes:

I forgot, I wanted to add a comment to clarify the qemu change here.

IIUC, docker can do qemu-based emulation, but we don't support it yet in

Guix, I believe we'd need to add the following packages:

- https://github.com/moby/buildkit:Seems to be a "next-gen" generic

image builder backend.

- https://github.com/docker/buildx:To have a `docker buildx' command,

to link docker with the buildkit backend.

Here's a new 2.5 patch that adds the following note:

;; Do not fail when buildkit-qemu-<target> isn't found.

;; FIXME: We might need to package buildkit and docker's

;; buildx plugin, to support qemu-based docker containers.

Hi Guix!

I just rebased this series, and did a quick round of new updates:

runc: 1.1.0 -> 1.1.1

containerd: 1.6.2 -> 1.6.4

docker: 20.10.14 -> 20.10.15

Tested locally briefly and ran:

make check-system TESTS="docker docker-system"

Thanks,

Pierre

Pierre Langlois (7):

gnu: runc: Update to 1.1.1.

gnu: containerd: Fix patch-paths build phase.

gnu: containerd: Update to 1.6.4.

gnu: containerd: Switch to gexp arguments.

gnu: docker: Fix mkfs.xfs reference.

gnu: docker: Update to 20.10.15.

gnu: docker: Switch to gexp and new input style.

gnu/local.mk | 1 -

gnu/packages/docker.scm | 628 ++++++++++----------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 -

gnu/packages/virtualization.scm | 9 +-

5 files changed, 318 insertions(+), 354 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

2.36.0

Pierre Langlois <pierre.langlois@gmx.com> writes:

phases after 'unpack because 'chdir doesn't exist.

---

gnu/packages/docker.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

--

2.36.0

[native-inputs]: Use new style.

---

gnu/packages/virtualization.scm | 9 ++++-----

1 file changed, 4 insertions(+), 5 deletions(-)

--

2.36.0

[arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". Set

PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX.

---

gnu/packages/docker.scm | 13 +++++++++----

1 file changed, 9 insertions(+), 4 deletions(-)

--

2.36.0

Pass all flags via make-flags variable. Switch to using

search-input-file.

---

gnu/packages/docker.scm | 95 +++++++++++++++++++++--------------------

1 file changed, 49 insertions(+), 46 deletions(-)

--

2.36.0

instead of bin/mkfs.xfs.

---

gnu/packages/docker.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

--

2.36.0

(docker-libnetwork): Update commit according to vendor.conf.

(docker)[origin]: Remove docker-fix-tests.patch.

[arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and

buildkit-qemu. Remove trailing #t.

[native-inputs]: Replace go-1.14 by go.

(docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t.

docker-libnetwork's vendor.conf.

---

gnu/local.mk | 1 -

gnu/packages/docker.scm | 72 +++++++++------------

gnu/packages/networking.scm | 6 +-

gnu/packages/patches/docker-fix-tests.patch | 28 --------

4 files changed, 32 insertions(+), 75 deletions(-)

delete mode 100644 gnu/packages/patches/docker-fix-tests.patch

--

-- client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

-+ client, err := plugins.NewClient("unix:///"+path.Join("/", pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})

- if err != nil {

- t.Fatalf("Failed to create client %v", err)

- }

--

2.36.0

to using search-input-file.

[inputs]: Use new style inputs.

---

gnu/packages/docker.scm | 483 ++++++++++++++++++++--------------------

1 file changed, 241 insertions(+), 242 deletions(-)

On Tue, 10 May 2022 00:35:17 +0100

Pierre Langlois <pierre.langlois@gmx.com> wrote:

LGTM!

LGTM!

Hi Danny,

Danny Milosavljevic <dannym@scratchpost.org> writes:

Just to be clear, are you OK with the two patches or the entire series?

Thanks for taking a look,

Pierre

Hi Pierre,

for some reason, I only see patch 5, 6, and 7 of the series.

I reviewed patch 5 and 6 already and found it good.

I am still reviewing patch 7.

Hi Pierre!

Very nice work, thanks for doing it!

I've reviewed the whole series (7 patches), made some changes mostly to

update to the latest current version of Docker 20.10.17 and containerd

at 1.6.6, added a commit to address 'guix lint' issues and another one

to allow the Docker system tests to pass on my old machine. I tested

using some Docker load I had at hand and pushed the series.

Thanks again!

Closing.

Maxim