From patchwork Wed May 21 14:34:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bjc--- via Guix-patches via X-Patchwork-Id: 42834 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 07D1F27BC4C; Wed, 21 May 2025 15:35:24 +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=unavailable 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 F259E27BC49 for ; Wed, 21 May 2025 15:35:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHkXB-0003Rl-Hi; Wed, 21 May 2025 10:35:05 -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 1uHkX9-0003RR-3a for guix-patches@gnu.org; Wed, 21 May 2025 10:35: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 1uHkX8-0004DO-Mb for guix-patches@gnu.org; Wed, 21 May 2025 10:35: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=RQ+I/XuQsMAkMngiuuDaIEXa0/mJu5x4N3lsrpLvEE0=; b=aG01As6JnmQ3t85uMBEfoi9zrfKAJy5o+pCeCgt+p2qY/hksRaLbYBODDfqpxUoV5hWWi5XoXAHyF+el565rF8yERPPfhvNwk+O/67U8coolVbE2UhkAju0dIs+tVvUx+Z5h8c6heY67w0Qx6auFKB/j5SgZ9aMtO/D/0v/1lDPOdvaNCAkLdLoIhX2onF2bNTwCtK3CHCCiOMpCJ65c27y21lNijYnYUdQLsePmnTX9ECid9rCepAdHPYTwBcmTEdkAz0GCMXgz5lEiJEvc5idCI5D0/vuy8GIP71iCX+rsW7ZV2YMGpFh2OLhEnn8T2BflP3Aax3Wj2pLRdr4R5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHkX8-0001nI-EV for guix-patches@gnu.org; Wed, 21 May 2025 10:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 2/5] gnu: docker: Add apparmor, openssl and shadow as inputs and update golang version References: In-Reply-To: Resent-From: arthurhdrodrigues@proton.me Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 May 2025 14:35: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> Received: via spool by 74746-submit@debbugs.gnu.org id=B74746.17478380906865 (code B ref 74746); Wed, 21 May 2025 14:35:02 +0000 Received: (at 74746) by debbugs.gnu.org; 21 May 2025 14:34:50 +0000 Received: from localhost ([127.0.0.1]:49974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHkWv-0001md-Tb for submit@debbugs.gnu.org; Wed, 21 May 2025 10:34:50 -0400 Received: from mail-24426.protonmail.ch ([109.224.244.26]:44449) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHkWo-0001mE-JN for 74746@debbugs.gnu.org; Wed, 21 May 2025 10:34:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=ap4mushuvnccfncqffxrxdbmw4.protonmail; t=1747838076; x=1748097276; bh=RQ+I/XuQsMAkMngiuuDaIEXa0/mJu5x4N3lsrpLvEE0=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=JQ/CYlvCqAfTl9tFw+LjvDmPzFfujcMqUbY85BExFkaHFJnt06XHB0Dgv3Iey/DAd ArsPFPgKtjCG1SwoHIDdj3jySMbHXDnEDKaTgLUfJaGR28VFtb1n5o3q4HOQ742hTW SgLuuYZFkpifsQphnv9qswFYavwrXpFG8s6cvvFej2KYcCzOr/RWbgsiz8j+nFTUUU S+lKIL0XGcUfhy5XCTSunC2zaHdWPT2jqBD2SaCpjBRM4Me3gzrtQgTtX1zctjocrU 0fkpS1JKuim4LE7sXww1zBRU9HfM4L0uOC7GxaiKJ0cflCYxTJIX/AdMSyrUON3irY tJxZx3kWp4ynw== Date: Wed, 21 May 2025 14:34:31 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: cb354470ced663a6e0c67c9cba3b24617b44d9fa 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: arthurhdrodrigues@proton.me X-ACL-Warn: , arthurhdrodrigues--- via Guix-patches X-Patchwork-Original-From: arthurhdrodrigues--- via Guix-patches via From: bjc--- via Guix-patches via 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: 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