From patchwork Wed Jun 11 15:06:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Rodrigues X-Patchwork-Id: 43061 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 483AB27BC4B; Wed, 11 Jun 2025 16:12:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B8B9A27BC49 for ; Wed, 11 Jun 2025 16:12:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPN3c-0007nP-Ow; Wed, 11 Jun 2025 11:08:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uPN3b-0007kx-0a for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uPN3a-0007Fy-Oi for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=+Pn5hOCziKvS2W3957eAWZqsNrF724I9ZmbdEzLpva0=; b=SsNQtt+56Pg1bev+usCiTMO6jKs29XoE2UmXTDiRs4EhlQlEfsIqdRdub6o0XZpxLZmSUMHsiBDkioxzFEdl7h2ksPAhKNYlGT5dd9amkF2c241LOe2JyWKfFqNc9uKOsnnkBg7h23LSZmrfiniJC0aSF9wUkuL0HwB4tp4gc81ujnL8ONEteLZ33a6gLmb+SAwvX6BLDSoxMHxTg6fgjmNZ+np7cje5I/NdUPnXHiRu4qJPtVTGV86Rx+czWixtSJChAPIh3My2TAkBxyV71/QSAu9qgsf9Tx6TnlHX2UwZz2AvVwCxuG9Eu0PXqEkMKkDvGUUmU0NY2XWMWTUTow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uPN3a-0003Lz-JZ for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 2/6] gnu: docker: Add apparmor, nftables, openssl and shadow as inputs and update golang version. References: In-Reply-To: Resent-From: Arthur Rodrigues Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jun 2025 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74746 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "74746@debbugs.gnu.org" <74746@debbugs.gnu.org> Cc: "arthurhdrodrigues@proton.me" Received: via spool by 74746-submit@debbugs.gnu.org id=B74746.174965442412533 (code B ref 74746); Wed, 11 Jun 2025 15:08:02 +0000 Received: (at 74746) by debbugs.gnu.org; 11 Jun 2025 15:07:04 +0000 Received: from localhost ([127.0.0.1]:50144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uPN2e-0003G3-8D for submit@debbugs.gnu.org; Wed, 11 Jun 2025 11:07:04 -0400 Received: from mail-43166.protonmail.ch ([185.70.43.166]:30691) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uPN2c-0003FG-1H for 74746@debbugs.gnu.org; Wed, 11 Jun 2025 11:07:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1749654415; x=1749913615; bh=+Pn5hOCziKvS2W3957eAWZqsNrF724I9ZmbdEzLpva0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=gQZovc4WuwHIZWCt/AebLnjskcn5m5p8lmhE1TcV2/WzuhZb8KM3CyJI/ep8JvsMZ B8Q+psW2fnbGDxhfuM8qMKKqEkGaOO5E/Z2h0Jx6GC1h4uBH2l44dtGSlRjO7DHudG A9Pr1uM9d8CJor34yerXnARAOcCmGM0FMFLj8bUwi1MTngscHr6EUXLLHLshByWFPL RVJEHegs5MheXL0kUcS9p1IG35zXnfT3kvI9Iqsy3UIw5i6l3pT1+fVclAOvY9xA3a jRtGjiGc4yoT4UiCPVF24m1iqAs6016+YRvu3XT8kp93q2KuvogiaU9ka2DrTP8sIX jvuPEJPC5xUeQ== Date: Wed, 11 Jun 2025 15:06:49 +0000 Message-ID: <_EYlB6Jk6uBdZOPz0hV4vN9WXbIOmv4mr_pOkBNuXQPSGOPUIfGTpMJnEUBVxxMPkKPQUxQdPSJlH5JvpUKEqkOeTygDi7_Zu1i9WS8cYuc=@proton.me> Feedback-ID: 108589825:user:proton X-Pm-Message-ID: bc18678a288c79e78c7b56b04a787d86601c2c28 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Arthur Rodrigues X-ACL-Warn: , Arthur Rodrigues via Guix-patches X-Patchwork-Original-From: Arthur Rodrigues via Guix-patches via From: Arthur Rodrigues Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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