diff mbox series

[bug#74746,2/6] gnu: docker: Add apparmor, nftables, openssl and shadow as inputs and update golang version.

Message ID _EYlB6Jk6uBdZOPz0hV4vN9WXbIOmv4mr_pOkBNuXQPSGOPUIfGTpMJnEUBVxxMPkKPQUxQdPSJlH5JvpUKEqkOeTygDi7_Zu1i9WS8cYuc=@proton.me
State New
Headers
Series None |

Commit Message

Arthur Rodrigues June 11, 2025, 3:06 p.m. UTC 
  Change-Id: I39c7cb3211d36eddc961e5ba7fd2d2b9183cd6df
---
 gnu/packages/docker.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
diff mbox series

Patch

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