Subject: [PATCH 2/5] gnu: docker: Add apparmor, openssl and shadow as inputs and update golang version

From: [email-masked]
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