GNU bug report logs - #74746
Updating Docker to v27

Previous Next

To reply to this bug, email your comments to 74746 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Josep Bigorra <jjbigorra <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: Updating Docker to v27
Date: Mon, 9 Dec 2024 15:55:00 +0100

[Message part 1 (text/plain, inline)]

Hi all, I am struggling to get new Docker versions working on Guix.
For the this is critical for day to day work and I start to have some
problems due to running on old version.
I attempted some changes to the Guix package for docker but no
success. See the patch attached and the error message.

Thanks
Joe

[0001-attempt-to-update-docker-to-v27.patch (text/x-patch, attachment)]

[7ali95z7arfcn10banpwigb23w3l7h-docker-27.3.1.drv (application/octet-stream, attachment)]

Message #8 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: Josep Bigorra <jjbigorra <at> gmail.com>
Cc: 74746 <at> debbugs.gnu.org
Subject: Re: [bug#74746] Updating Docker to v27
Date: Mon, 09 Dec 2024 16:21:36 +0100

Josep Bigorra writes:

> Hi all, I am struggling to get new Docker versions working on Guix.
> For the this is critical for day to day work and I start to have some
> problems due to running on old version.
> I attempted some changes to the Guix package for docker but no
> success. See the patch attached and the error message.

> starting phase `separate-from-pid1'

> Backtrace:
>           10 (primitive-load "/gnu/store/xgwamcagyz6lkf4hrwncdrxyc63…")
> In guix/build/gnu-build-system.scm:
>     966:2  9 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
> In ice-9/boot-9.scm:
>   1752:10  8 (with-exception-handler _ _ #:unwind? _ # _)
> In srfi/srfi-1.scm:
>     634:9  7 (for-each #<procedure fffff413cd80 at guix/build/gnu-b…> …)
> In ice-9/boot-9.scm:
>   1752:10  6 (with-exception-handler _ _ #:unwind? _ # _)
> In guix/build/gnu-build-system.scm:
>    987:23  5 (_)
> In ice-9/eval.scm:
>     619:8  4 (_ #(#(#<directory (guile-user) fffff778ec80>) (# # …)))
> In guix/build/utils.scm:
>    903:19  3 (with-atomic-file-replacement "vendor/github.com/conta…" …)
> In unknown file:
>            2 (mkstemp! "vendor/github.com/containerd/containerd/run…" …)

So this file "vendor/github.com/containerd/containerd/run…" does not
exist, which is visible from the unpack log.  You can just comment-out
that substitute line, or better yet, find out the new name of that
source file like you did with execution_unix.go-> execution_linux.go

It may be worth your while to check all the substitute* file names in
the "patch-paths" phase beforehand.

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke <at> gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

Message #11 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Josep Bigorra <jjbigorra <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Date: Mon, 9 Dec 2024 16:12:25 +0100

Thank you Janneke for the quick reply, I will continue pursuing a fix.
It seems like it will take me a while and I will need to be really at
my best, to understand the errors,
greetings

Message #14 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Josep Bigorra <jjbigorra <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Date: Mon, 9 Dec 2024 16:51:43 +0100

I am afraid I am at my knowledge's end. I think also the initial patch
i submitted is not helping at all.
I face countless problems at build time, and even the application of a
patch (containerd-create-pid-file.patch) is failing at guix build time
(while locally and manually it works fine).
I am officially calling it a day on this one, I am unfamiliar with
advanced Guix builds, and even more unfamiliar with how Docker
internally should build.
I would really appreciate some help from more experienced people here,

Message #17 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Josep Bigorra <jjbigorra <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Subject: To Janneke
Date: Mon, 9 Dec 2024 20:51:17 +0100

I ended up going a different direction today and using root-less setup
with Podman. I am very happy with it, and wanted to teach others how
to achieve is in Guix:

https://jointhefreeworld.org/blog/articles/gnu-linux/podman-root-less-guix/

Still would be awesome to see Docker upgraded btw!

Greetings Joe

Message #20 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Subject: Updating Docker to v27
Date: Wed, 11 Dec 2024 18:52:25 +0000

[Message part 1 (text/plain, inline)]

Hi,

Containerd package packed with all vendor preserved.
As the amount of missing packages are huge (the same case as
Kubo ipfs).

I'll take a look for solution as I'm in golang mod this week :-).

Thanks,
Oleg

[Message part 2 (text/html, inline)]

Message #23 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Subject: Updating Docker to v27
Date: Wed, 11 Dec 2024 21:24:20 +0000

[Message part 1 (text/plain, inline)]

Hi,

The initial attempt to update Docker has been failed.

I've madden a try to import containerd completely.

    guix go import --recursive github.com/containerd/containerd/v2

Produced 353 new packages which are overlap with missing in kubo,
matterbridge, prometheus, restic, afero and some other.
It would be nice unbundle each of them properly.

Scheduled for go-team, any help in packaging are welcome.

--
Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #26 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 0/5] Update Docker to 28.1.1
Date: Wed, 21 May 2025 14:32:28 +0000

[Message part 1 (text/plain, inline)]

Hello,

This is a WIP patch series to update Docker to version v28.1.1.
I got all phases to succeed, with the exception of the check phase,
which fails due to the lack of libsystemd package in one specific test.
The build log with the error is attached.

Packaging libsystemd because of one unit test seems too much work.
So I tried some stuff to avoid this test. For instance, I tried to use 
`(substitute` to remove 'github.com/docker/docker/daemon/logger/journald/internal/sdjournal'
from the list of folders contained in the variable base_pkg_list, but this didn't work.

By disabling the check phase, everything works fine.
I will continue to work on this in my spare time, but I'm really stuck in this phase and 
accept any suggestions or help :)

Greetings,
Arthur
 
Arthur Rodrigues (5):
  gnu: docker: Update copyright, Docker version and tarball hash
  gnu: docker: Add apparmor, openssl and shadow as inputs and update
    golang version
  gnu: docker: Update substitutions in patch-paths phase
  gnu: docker: Avoid build failing when looking for buildkit in PATH
  gnu: docker: Remove docker-<version> from out-bin
 
 gnu/packages/docker.scm | 97 +++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 53 deletions(-)
 
 
base-commit: 5f5d84beccc180f1b51474c0e47eb6e0d0c9175f
-- 
2.49.0

[8ar7gdhrsjb68nd9grhgvx98k5zzch-docker-28.1.1.drv.gz (application/gzip, attachment)]

Message #29 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 1/5] gnu: docker: Update copyright,
 Docker version and tarball  hash
Date: Wed, 21 May 2025 14:33:31 +0000

Change-Id: Ibcd04ca3fd6481ce4461f8ef0c28135794716aea
---
 gnu/packages/docker.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 630fc1750b..1a1c566519 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois <at> gmx.com>
 ;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2025 Arthur H. D. Rodrigues <arthurhdrodrigues <at> proton.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,7 +62,7 @@ (define-module (gnu packages docker)
 
 ;; Note - when changing Docker versions it is important to update the versions
 ;; of several associated packages (docker-libnetwork and go-sctp).
-(define %docker-version "20.10.27")
+(define %docker-version "28.1.1")
 
 (define-public python-docker
   (package
@@ -335,7 +336,7 @@ (define-public docker
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "017frilx35w3m4dz3n6m2f293q4fq4jrk6hl8f7wg5xs3r8hswvq"))))
+        (base32 "1fxalpnsm9lzqjvvf81zi2na6b7dwx3g9nqqm0mg1m7qx6v5n7ql"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.49.0

Message #32 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 2/5] gnu: docker: Add apparmor,
 openssl and shadow as inputs  and update golang version
Date: Wed, 21 May 2025 14:34:31 +0000

Change-Id: Ibe8fd133102a52b94e6d301112a840ba318d9b79
---
 gnu/packages/docker.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 1a1c566519..ee41c86326 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages docker)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
+  #:use-module (gnu packages admin)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -45,12 +46,14 @@ (define-module (gnu packages docker)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages apparmor)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -453,8 +456,12 @@ (define-public docker
                    ("ip" "/sbin/ip"))
 
                   (substitute-Command*
+                   ("apparmor_parser" "/sbin/apparmor_parser")
+                   ("openssl" "/bin/openssl")
+                   ("usermod" "/sbin/usermod")
                    ("modprobe" "/bin/modprobe")
                    ("pvcreate" "/sbin/pvcreate")
+                   ("id" "/bin/id")
                    ("vgcreate" "/sbin/vgcreate")
                    ("lvcreate" "/sbin/lvcreate")
                    ("lvconvert" "/sbin/lvconvert")
@@ -582,13 +589,16 @@ (define-public docker
            docker-libnetwork-cmd-proxy
            e2fsprogs
            git
+           apparmor
            iproute
            iptables
            kmod
            libseccomp
            pigz
            procps
+           openssl
            runc
+           shadow
            util-linux
            lvm2
            tini
@@ -596,7 +606,7 @@ (define-public docker
            xz))
     (native-inputs
      (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
-           go-1.20 gotestsum pkg-config))
+           go-1.23 gotestsum pkg-config))
     (synopsis "Container component library and daemon")
     (description "This package provides a framework to assemble specialized
 container systems.  It includes components for orchestration, image
-- 
2.49.0

Message #35 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 3/5] gnu: docker: Update substitutions in patch-paths phase
Date: Wed, 21 May 2025 14:35:43 +0000

Change-Id: Id681a07a796dab066f039f7d6d5508065ae02982
---
 gnu/packages/docker.scm | 48 ++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index ee41c86326..f4ba760914 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -356,67 +356,47 @@ (define-public docker
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "builder/builder-next/executor_unix.go"
-                (("CommandCandidates:.*runc.*")
-                 (string-append "CommandCandidates: []string{\""
+              (substitute* "builder/builder-next/executor_linux.go"
+                (("runcCmds := .*")
+                 (string-append "runcCmds := []string{\""
                                 (search-input-file inputs "/sbin/runc")
-                                "\"},\n")))
+                                "\"}")))
               (substitute* "vendor/github.com/containerd/go-runc/runc.go"
                 (("DefaultCommand = .*")
                  (string-append "DefaultCommand = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n")))
-              (substitute* "vendor/github.com/containerd/containerd/\
-runtime/v1/linux/runtime.go"
-                (("defaultRuntime[ \t]*=.*")
-                 (string-append "defaultRuntime = \""
-                                (search-input-file inputs "/sbin/runc")
-                                "\"\n"))
-                (("defaultShim[ \t]*=.*")
-                 (string-append "defaultShim = \""
-                                (search-input-file inputs "/bin/containerd-shim")
-                                "\"\n")))
-              (substitute* "daemon/daemon_unix.go"
-                (("DefaultShimBinary = .*")
-                 (string-append "DefaultShimBinary = \""
-                                (search-input-file inputs "/bin/containerd-shim")
-                                "\"\n"))
-                (("DefaultRuntimeBinary = .*")
-                 (string-append "DefaultRuntimeBinary = \""
-                                (search-input-file inputs "/sbin/runc")
-                                "\"\n")))
               (substitute* "daemon/runtime_unix.go"
                 (("defaultRuntimeName = .*")
                  (string-append "defaultRuntimeName = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n")))
               (substitute* "daemon/config/config.go"
-                (("StockRuntimeName = .*")
-                 (string-append "StockRuntimeName = \""
+                (("DefaultRuntimeBinary = .*")
+                 (string-append "DefaultRuntimeBinary = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n"))
                 (("DefaultInitBinary = .*")
                  (string-append "DefaultInitBinary = \""
                                 (search-input-file inputs "/bin/tini-static")
                                 "\"\n")))
-              (substitute* "daemon/config/config_common_unix_test.go"
+              (substitute* "daemon/config/config_linux_test.go"
                 (("expectedInitPath: \"docker-init\"")
                  (string-append "expectedInitPath: \""
                                 (search-input-file inputs "/bin/tini-static")
                                 "\"")))
+              (substitute* "vendor.mod"
+                (("go 1.23.0")
+                 (string-append "go 1.23")))
+              ;; Avoid installation of proxy in unit tests
+              (substitute* "hack/test/unit"
+                (("if ! type docker-proxy")
+                 (string-append "if type docker-proxy")))
               (substitute* "vendor/github.com/moby/buildkit/executor/\
 runcexecutor/executor.go"
                 (("var defaultCommandCandidates = .*")
                  (string-append "var defaultCommandCandidates = []string{\""
                                 (search-input-file inputs "/sbin/runc") "\"}")))
-              (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go"
-                (("var userlandProxyCommandName = .*")
-                 (string-append "var userlandProxyCommandName = \""
-                                (search-input-file inputs "/bin/proxy")
-                                "\"\n")))
-              (substitute* "pkg/archive/archive.go"
-                (("string\\{\"xz")
-                 (string-append "string{\"" (search-input-file inputs "/bin/xz"))))
 
               (let ((source-files (filter (lambda (name)
                                             (not (string-contains name "test")))
-- 
2.49.0

Message #38 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 4/5] gnu: docker: Avoid build failing when looking for
 buildkit in PATH
Date: Wed, 21 May 2025 14:36:34 +0000

Change-Id: I0607fc73ceb602e92bc8d5bbae3e079785dfd0ba
---
 gnu/packages/docker.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index f4ba760914..84b2dd5d92 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -484,10 +484,19 @@ (define-public docker
                    "exec.Command")
                   ;; Search for ZFS in PATH.
                   (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
-                 ;; 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.
-                  (("\\<LookPath\\(\"buildkit-qemu-\"") "LooxPath(\"buildkit-qemu-\"")
+                  ;; 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.
+                  (("\\<LookPath\\(\"buildkit-qemu-\"")
+                   "LooxPath(\"buildkit-qemu-\"")
+                  (("\\<LookPath\\(\"buildkit-cni-bridge\"")
+                   "LooxPath(\"buildkit-cni-bridge\"")
+                  (("\\<LookPath\\(\"buildkit-cni-loopback\"")
+                   "LooxPath(\"buildkit-cni-loopback\"")
+                  (("\\<LookPath\\(\"buildkit-cni-host-local\"")
+                   "LooxPath(\"buildkit-cni-host-local\"")
+                  (("\\<LookPath\\(\"buildkit-cni-firewall\"")
+                   "LooxPath(\"buildkit-cni-firewall\"")
                   ;; Fail on other unsubstituted LookPaths.
                   (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
                   (("\\<LooxPath") "LookPath")))))
-- 
2.49.0

Message #41 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: arthurhdrodrigues <at> proton.me
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Subject: [PATCH 5/5] gnu: docker: Remove docker-<version> from out-bin
Date: Wed, 21 May 2025 14:37:18 +0000

Change-Id: Ib6739014c275a00336de4a2c108fbd916b59224b
---
 gnu/packages/docker.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 84b2dd5d92..ef0f66ca3b 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -504,27 +504,21 @@ (define-public docker
             (lambda _
               ;; Needs internet access.
               (delete-file "builder/remotecontext/git/gitutils_test.go")
-              ;; Permission denied.
-              (delete-file "daemon/graphdriver/devmapper/devmapper_test.go")
               ;; Operation not permitted (idtools.MkdirAllAndChown).
               (delete-file "daemon/graphdriver/vfs/vfs_test.go")
               ;; Timeouts after 5 min.
               (delete-file "plugin/manager_linux_test.go")
               ;; Operation not permitted.
-              (delete-file "daemon/graphdriver/aufs/aufs_test.go")
               (delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
-              (delete-file "daemon/graphdriver/overlay/overlay_test.go")
               (delete-file "daemon/graphdriver/overlay2/overlay_test.go")
-              (delete-file "pkg/chrootarchive/archive_unix_test.go")
               (delete-file "daemon/container_unix_test.go")
+              (delete-file "internal/safepath/join_test.go")
               ;; This file uses cgroups and /proc.
               (delete-file "pkg/sysinfo/sysinfo_linux_test.go")
               ;; This file uses cgroups.
               (delete-file "runconfig/config_test.go")
               ;; This file uses /var.
-              (delete-file "daemon/oci_linux_test.go")
-              ;; Signal tests fail in bizarre ways
-              (delete-file "pkg/signal/signal_linux_test.go")))
+              (delete-file "daemon/oci_linux_test.go")))
           (replace 'configure
             (lambda _
               (setenv "DOCKER_BUILDTAGS" "seccomp")
@@ -566,10 +560,7 @@ (define-public docker
             (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 (string-append "bundles/dynbinary-daemon/dockerd-"
-                                             (getenv "VERSION"))
-                              out-bin)))))))
+                (install-file "bundles/dynbinary-daemon/dockerd" out-bin)))))))
     (inputs
      (list btrfs-progs
            containerd       ; for containerd-shim
-- 
2.49.0

Message #44 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 0/6] Update Docker to version v28.2.2
Date: Wed, 11 Jun 2025 15:04:40 +0000

Hello,

I fixed the problem that I mentioned in the cover letter of my last patch series.
In the meanwhile Docker was updated to version 28.2.2 in the upstream,
so this patch series updates it to this newer version.

Any feedback is welcome :)

Arthur Rodrigues (6):
  gnu: docker: Update copyright, Docker version and sha256.
  gnu: docker: Add apparmor, nftables, openssl and shadow as inputs and
    update golang version.
  gnu: docker: Update substitutions in patch-paths phase.
  gnu: docker: Avoid build failing when looking for buildkit in PATH.
  gnu: docker: Update delete-failing-tests phase.
  gnu: docker: Remove docker-<version> from install phase.

 gnu/packages/docker.scm | 123 ++++++++++++++++++++++------------------
 1 file changed, 67 insertions(+), 56 deletions(-)


base-commit: e4e3176a061d046e34d30a0c39a8afc913d4228d
-- 
2.49.0

Message #47 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 1/6] gnu: docker: Update copyright, Docker version and sha256.
Date: Wed, 11 Jun 2025 15:05:51 +0000

Change-Id: I1f0e2f2d1cbae06e7b9c462ca59ff35d5179c7bd
---
 gnu/packages/docker.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 630fc1750b..9147249a41 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois <at> gmx.com>
 ;;; Copyright © 2024 Nicolas Graves <ngraves <at> ngraves.fr>
 ;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2025 Arthur H. D. Rodrigues <arthurhdrodrigues <at> proton.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,7 +62,7 @@ (define-module (gnu packages docker)
 
 ;; Note - when changing Docker versions it is important to update the versions
 ;; of several associated packages (docker-libnetwork and go-sctp).
-(define %docker-version "20.10.27")
+(define %docker-version "28.2.2")
 
 (define-public python-docker
   (package
@@ -335,7 +336,7 @@ (define-public docker
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "017frilx35w3m4dz3n6m2f293q4fq4jrk6hl8f7wg5xs3r8hswvq"))))
+        (base32 "0w859a1q82aw58a2kb4z124igxzg015dipi1vqyb4bj9s3c8yv33"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.49.0

Message #50 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 2/6] gnu: docker: Add apparmor, nftables,
 openssl and shadow  as inputs and update golang version.
Date: Wed, 11 Jun 2025 15:06:49 +0000

Change-Id: I39c7cb3211d36eddc961e5ba7fd2d2b9183cd6df
---
 gnu/packages/docker.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 9147249a41..b03b551a05 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages docker)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
+  #:use-module (gnu packages admin)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -45,12 +46,14 @@ (define-module (gnu packages docker)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages apparmor)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages networking)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -450,11 +453,16 @@ (define-public docker
                    ("iptables" "/sbin/iptables")
                    ("ip6tables" "/sbin/ip6tables")
                    ("iptables-legacy" "/sbin/iptables")
-                   ("ip" "/sbin/ip"))
+                   ("ip" "/sbin/ip")
+                   ("nft" "/sbin/nft"))
 
                   (substitute-Command*
+                   ("apparmor_parser" "/sbin/apparmor_parser")
+                   ("openssl" "/bin/openssl")
+                   ("usermod" "/sbin/usermod")
                    ("modprobe" "/bin/modprobe")
                    ("pvcreate" "/sbin/pvcreate")
+                   ("id" "/bin/id")
                    ("vgcreate" "/sbin/vgcreate")
                    ("lvcreate" "/sbin/lvcreate")
                    ("lvconvert" "/sbin/lvconvert")
@@ -582,13 +590,17 @@ (define-public docker
            docker-libnetwork-cmd-proxy
            e2fsprogs
            git
+           apparmor
            iproute
            iptables
            kmod
            libseccomp
+           nftables
            pigz
            procps
+           openssl
            runc
+           shadow
            util-linux
            lvm2
            tini
@@ -596,7 +608,7 @@ (define-public docker
            xz))
     (native-inputs
      (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
-           go-1.20 gotestsum pkg-config))
+           go-1.23 gotestsum pkg-config))
     (synopsis "Container component library and daemon")
     (description "This package provides a framework to assemble specialized
 container systems.  It includes components for orchestration, image
-- 
2.49.0

Message #53 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 3/6] gnu: docker: Update substitutions in patch-paths phase.
Date: Wed, 11 Jun 2025 15:07:39 +0000

Change-Id: I9d8c6fbc189858bb061deeadbcc616787a0abbc3
---
 gnu/packages/docker.scm | 63 +++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index b03b551a05..755e2d7211 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -356,67 +356,62 @@ (define-public docker
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "builder/builder-next/executor_unix.go"
-                (("CommandCandidates:.*runc.*")
-                 (string-append "CommandCandidates: []string{\""
+              (substitute* "builder/builder-next/executor_linux.go"
+                (("runcCmds := .*")
+                 (string-append "runcCmds := []string{\""
                                 (search-input-file inputs "/sbin/runc")
-                                "\"},\n")))
+                                "\"}")))
               (substitute* "vendor/github.com/containerd/go-runc/runc.go"
                 (("DefaultCommand = .*")
                  (string-append "DefaultCommand = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n")))
-              (substitute* "vendor/github.com/containerd/containerd/\
-runtime/v1/linux/runtime.go"
-                (("defaultRuntime[ \t]*=.*")
-                 (string-append "defaultRuntime = \""
-                                (search-input-file inputs "/sbin/runc")
-                                "\"\n"))
-                (("defaultShim[ \t]*=.*")
-                 (string-append "defaultShim = \""
-                                (search-input-file inputs "/bin/containerd-shim")
-                                "\"\n")))
-              (substitute* "daemon/daemon_unix.go"
-                (("DefaultShimBinary = .*")
-                 (string-append "DefaultShimBinary = \""
-                                (search-input-file inputs "/bin/containerd-shim")
-                                "\"\n"))
-                (("DefaultRuntimeBinary = .*")
-                 (string-append "DefaultRuntimeBinary = \""
-                                (search-input-file inputs "/sbin/runc")
-                                "\"\n")))
+              (substitute* "daemon/runtime_unix_test.go"
+                (("Path: \"/bin/true\",")
+                 (string-append "Path: \""
+                                (search-input-file inputs "/bin/true")
+                                "\","))
+                (("Path: \"/bin/false\",")
+                 (string-append "Path: \""
+                                (search-input-file inputs "/bin/false")
+                                "\",")))
               (substitute* "daemon/runtime_unix.go"
                 (("defaultRuntimeName = .*")
                  (string-append "defaultRuntimeName = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n")))
               (substitute* "daemon/config/config.go"
-                (("StockRuntimeName = .*")
-                 (string-append "StockRuntimeName = \""
+                (("DefaultRuntimeBinary = .*")
+                 (string-append "DefaultRuntimeBinary = \""
                                 (search-input-file inputs "/sbin/runc")
                                 "\"\n"))
                 (("DefaultInitBinary = .*")
                  (string-append "DefaultInitBinary = \""
                                 (search-input-file inputs "/bin/tini-static")
                                 "\"\n")))
-              (substitute* "daemon/config/config_common_unix_test.go"
+              (substitute* "daemon/config/config_linux_test.go"
                 (("expectedInitPath: \"docker-init\"")
                  (string-append "expectedInitPath: \""
                                 (search-input-file inputs "/bin/tini-static")
                                 "\"")))
+              (substitute* "vendor.mod"
+                (("go 1.23.0")
+                 (string-append "go 1.23")))
+              ;; Avoid installation of proxy in unit tests
+              (substitute* "hack/test/unit"
+                (("if ! type docker-proxy")
+                 (string-append "if type docker-proxy"))
+                ;; Disable testing libnetwork, since we don't package it as an output
+                (("libnetwork_pkg_list=.*")
+                 (string-append "libnetwork_pkg_list=\"\"\n"))
+                (("BUILDFLAGS=.*")
+                 (string-append "BUILDFLAGS=(-tags 'netgo')\n")))
+
               (substitute* "vendor/github.com/moby/buildkit/executor/\
 runcexecutor/executor.go"
                 (("var defaultCommandCandidates = .*")
                  (string-append "var defaultCommandCandidates = []string{\""
                                 (search-input-file inputs "/sbin/runc") "\"}")))
-              (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go"
-                (("var userlandProxyCommandName = .*")
-                 (string-append "var userlandProxyCommandName = \""
-                                (search-input-file inputs "/bin/proxy")
-                                "\"\n")))
-              (substitute* "pkg/archive/archive.go"
-                (("string\\{\"xz")
-                 (string-append "string{\"" (search-input-file inputs "/bin/xz"))))
 
               (let ((source-files (filter (lambda (name)
                                             (not (string-contains name "test")))
-- 
2.49.0

Message #56 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 4/6] gnu: docker: Avoid build failing when looking for
 buildkit in PATH.
Date: Wed, 11 Jun 2025 15:08:50 +0000

Change-Id: Ib8c1967322bcad424dac8210378bd78df85c020a
---
 gnu/packages/docker.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 755e2d7211..448261e61c 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -500,10 +500,19 @@ (define-public docker
                    "exec.Command")
                   ;; Search for ZFS in PATH.
                   (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
-                 ;; 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.
-                  (("\\<LookPath\\(\"buildkit-qemu-\"") "LooxPath(\"buildkit-qemu-\"")
+                  ;; 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.
+                  (("\\<LookPath\\(\"buildkit-qemu-\"")
+                   "LooxPath(\"buildkit-qemu-\"")
+                  (("\\<LookPath\\(\"buildkit-cni-bridge\"")
+                   "LooxPath(\"buildkit-cni-bridge\"")
+                  (("\\<LookPath\\(\"buildkit-cni-loopback\"")
+                   "LooxPath(\"buildkit-cni-loopback\"")
+                  (("\\<LookPath\\(\"buildkit-cni-host-local\"")
+                   "LooxPath(\"buildkit-cni-host-local\"")
+                  (("\\<LookPath\\(\"buildkit-cni-firewall\"")
+                   "LooxPath(\"buildkit-cni-firewall\"")
                   ;; Fail on other unsubstituted LookPaths.
                   (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
                   (("\\<LooxPath") "LookPath")))))
-- 
2.49.0

Message #59 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 5/6] gnu: docker: Update delete-failing-tests phase.
Date: Wed, 11 Jun 2025 15:09:31 +0000

Change-Id: I205b24f1770989b0662cb5291e0503e1c4b140d3
---
 gnu/packages/docker.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 448261e61c..9a9ed9a12d 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -519,28 +519,25 @@ (define-public docker
           (add-after 'patch-paths 'delete-failing-tests
             (lambda _
               ;; Needs internet access.
-              (delete-file "builder/remotecontext/git/gitutils_test.go")
-              ;; Permission denied.
-              (delete-file "daemon/graphdriver/devmapper/devmapper_test.go")
+              (delete-file "daemon/daemon_linux_test.go")
+              ;; Needs userland-proxy
+              (delete-file "cmd/dockerd/daemon_test.go")
+              (delete-file "cmd/dockerd/daemon_unix_test.go")
               ;; Operation not permitted (idtools.MkdirAllAndChown).
               (delete-file "daemon/graphdriver/vfs/vfs_test.go")
               ;; Timeouts after 5 min.
               (delete-file "plugin/manager_linux_test.go")
               ;; Operation not permitted.
-              (delete-file "daemon/graphdriver/aufs/aufs_test.go")
               (delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
-              (delete-file "daemon/graphdriver/overlay/overlay_test.go")
               (delete-file "daemon/graphdriver/overlay2/overlay_test.go")
-              (delete-file "pkg/chrootarchive/archive_unix_test.go")
               (delete-file "daemon/container_unix_test.go")
+              (delete-file "internal/safepath/join_test.go")
               ;; This file uses cgroups and /proc.
               (delete-file "pkg/sysinfo/sysinfo_linux_test.go")
               ;; This file uses cgroups.
               (delete-file "runconfig/config_test.go")
-              ;; This file uses /var.
-              (delete-file "daemon/oci_linux_test.go")
-              ;; Signal tests fail in bizarre ways
-              (delete-file "pkg/signal/signal_linux_test.go")))
+              ;; This files uses /etc/resolv.conf
+              (delete-file "libnetwork/resolvconf/resolvconf_unix_test.go")))
           (replace 'configure
             (lambda _
               (setenv "DOCKER_BUILDTAGS" "seccomp")
-- 
2.49.0

Message #62 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 6/6] gnu: docker: Remove docker-<version> from install phase.
Date: Wed, 11 Jun 2025 15:10:07 +0000

Change-Id: I898bd0f087268fa079f5de499f9dad0bf7049a01
---
 gnu/packages/docker.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 9a9ed9a12d..2e92af2fea 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -579,10 +579,7 @@ (define-public docker
             (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 (string-append "bundles/dynbinary-daemon/dockerd-"
-                                             (getenv "VERSION"))
-                              out-bin)))))))
+                (install-file "bundles/dynbinary-daemon/dockerd" out-bin)))))))
     (inputs
      (list btrfs-progs
            containerd       ; for containerd-shim
-- 
2.49.0

Message #65 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 74746 <at> debbugs.gnu.org
Cc: arthurhdrodrigues <at> proton.me
Subject: Updating Docker to v27
Date: Sat, 21 Jun 2025 18:06:09 +0100

[Message part 1 (text/plain, inline)]

Hi Arthur,

Would like to collaborate on https://codeberg.org/guix/guix/pulls? I see
this package has many inputs ready on go-team so it would take a little
bit more efforts to completely build from source and reduce number of
manipulation with "vendor".

I if you feel you have some interest and time I'll create milestone to
split the efforts.

WDYT?

--
Oleg

[signature.asc (application/pgp-signature, inline)]

Message #68 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: 74746 <at> debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Subject: Re: Updating Docker to v27
Date: Wed, 25 Jun 2025 15:30:35 +0000

Hi Sharlatan,

Sorry for the late reply.

> Would like to collaborate on https://codeberg.org/guix/guix/pulls? I see
> this package has many inputs ready on go-team so it would take a little
> bit more efforts to completely build from source and reduce number of
> manipulation with "vendor".
> 
> I if you feel you have some interest and time I'll create milestone to
> split the efforts.
> 
> WDYT?

Yeah sure!
I think that is a good plan.
My account on codesberg is arthurhdrodrigues.
In this case, should I create PRs to the go-team branch?

Greetings,
Arthur

Message #71 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
Cc: guix-devel <guix-devel <at> gnu.org>, 74746 <at> debbugs.gnu.org
Subject: Re: Updating Docker to v27
Date: Wed, 25 Jun 2025 19:25:19 +0100

[Message part 1 (text/plain, inline)]

Hi,

Yep, give it a go on go-team.

If anyone would like to participate in Docker updates sprint,
patches are welcome.

Having Docker proper updated will bring opportunity to refresh
forgejo-runner as well ;-)

VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

… наш разум - превосходная объяснительная машина которая способна найти
смысл почти в чем угодно, истолковать любой феномен, но совершенно не в
состоянии принять мысль о непредсказуемости.

On Wed, 25 Jun 2025, 16:30 Arthur Rodrigues, <arthurhdrodrigues <at> proton.me>
wrote:

> Hi Sharlatan,
>
> Sorry for the late reply.
>
> > Would like to collaborate on https://codeberg.org/guix/guix/pulls? I see
> > this package has many inputs ready on go-team so it would take a little
> > bit more efforts to completely build from source and reduce number of
> > manipulation with "vendor".
> >
> > I if you feel you have some interest and time I'll create milestone to
> > split the efforts.
> >
> > WDYT?
>
> Yeah sure!
> I think that is a good plan.
> My account on codesberg is arthurhdrodrigues.
> In this case, should I create PRs to the go-team branch?
>
> Greetings,
> Arthur
>

[Message part 2 (text/html, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.