From patchwork Mon Dec 9 14:55:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josep Bigorra X-Patchwork-Id: 34692 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 7293827BBE9; Mon, 9 Dec 2024 14:56:26 +0000 (GMT) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E639027BBE2 for ; Mon, 9 Dec 2024 14:56:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKfBA-0001PR-EM; Mon, 09 Dec 2024 09:56:09 -0500 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 1tKfB5-0001P9-Sz for guix-patches@gnu.org; Mon, 09 Dec 2024 09:56:04 -0500 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 1tKfB5-0000XG-6v for guix-patches@gnu.org; Mon, 09 Dec 2024 09:56:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:MIME-Version:To:Subject; bh=I45YU/wEA/7sUFKTRI/k4uCRXrc9bud7g7iANSaOQO4=; b=tVDEDcf98V7PQRolmg5ouA5DqR2mhrr0BRa1JZnUzTYhIllaxdGxFw5/ounGBFO6lL/hr3iTPdVgv/o/2fKTVH43v6GRonuTgWOy5Bz02CAgNdHiQrs1kvqZjKiwgvptmr9FsDQS9B1C/oOEIjuTQPMLyGVfEDOWVdAv5xosbQezcOBK3YO6chp5l2aC3pajlC4ACDfiCgWFQ6aLbl/Gz51RsoNMeLZ3x3ZwX7qjPlWyfe2I/dhlSXtIFmh6AlsTvXawFKcpwiI/quXnog3cVH7fTUUcA+rlBdRVxY4txCTz7y5e9KV2Kr7AsUnGD9njgJGUOkH05+N5NiJ8CQ+vhQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKfB4-00014L-Qn for guix-patches@gnu.org; Mon, 09 Dec 2024 09:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] Updating Docker to v27 Resent-From: Josep Bigorra Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 14:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74746 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 74746@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17337561302760 (code B ref -1); Mon, 09 Dec 2024 14:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Dec 2024 14:55:30 +0000 Received: from localhost ([127.0.0.1]:53782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKfAX-0000iP-Sa for submit@debbugs.gnu.org; Mon, 09 Dec 2024 09:55:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:50952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKfAU-0000ga-RI for submit@debbugs.gnu.org; Mon, 09 Dec 2024 09:55:27 -0500 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 1tKfAT-0001Ng-6F for guix-patches@gnu.org; Mon, 09 Dec 2024 09:55:25 -0500 Received: from mail-vs1-xe2c.google.com ([2607:f8b0:4864:20::e2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tKfAH-0000VC-Ax for guix-patches@gnu.org; Mon, 09 Dec 2024 09:55:17 -0500 Received: by mail-vs1-xe2c.google.com with SMTP id ada2fe7eead31-4aff04f17c7so764051137.0 for ; Mon, 09 Dec 2024 06:55:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733756112; x=1734360912; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=I45YU/wEA/7sUFKTRI/k4uCRXrc9bud7g7iANSaOQO4=; b=XCCcXdM6W2J5aJbwy2iEB7bKOc0ZxGz7bQ6BB+Hb81U/dlVP/eRxArfNQMt5wHdkWl gaLz/ZuFxgV8uzL2fYTGyKHdfZwjyrpwOl5Kkx7eZwNxCaRPnXew3S8pd4bUuhA4spoZ RgHvHQdobh0gKfalQU0aSslZFCEVTBt3rQJ+vCbRjAXM5dlHO+6Suwy0d24Ec77KYsNt JMY8uXnmLeIw6Nhu/Dkr0JByEwpNXrOsfa44JtExgT8uC4gpdRO8FpgqZtvo7i4NENh0 k9zMrZnr7vk4q2u4gPBXc8MNwo3JeeFrbOqi4ttszgOI+Ui7bWzdzJUaqqwltRz8bakV ftBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733756112; x=1734360912; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=I45YU/wEA/7sUFKTRI/k4uCRXrc9bud7g7iANSaOQO4=; b=Z18mCAa8qbasWTzMi4d5qlVMfxXzm4JP/gnMjjAWvkBr6Flp27d9CRA5q3G5BFlRwf ITcfap+90fSini8VUUatCNW5KFQVgPowPnETuyG9PuIzoxKWLfeVfr6K65BVkDMqvLo+ yrcY1cHJg3jEXiWFIGC8J8uSPG9RFHGg4zEtf6+FixmdJshDDaJPCgxhBfFUhj4f5jhL fE62+mr9oT6kckcWVFE2cqxrHnGJU2pDCid/5bGrr1RNNQFSMgnyaAZgomTmRjwfwoAQ 1VwiWHx2Omdb8zgkq0HU/WC1BQd8sZJ59wlPxe32UOJox+jzFw6/l2H9Yab7gQyHcTCs kZkg== X-Gm-Message-State: AOJu0YzQ2veJU4oTTjJR/QscSAXVM+UPhw+AV0Qe0X7S5Il9gHmjNW/i ox5Qt4kdtvxAtKT4DjBaxLmNhc4uOnPJkYOnUjAymq6XSquu0fQl+KNcRiS5Y5BomkmK0jHHa2K 6apYT8tO2MFLHAoY0KCm4TtRac2S9tgk= X-Gm-Gg: ASbGncsysE+RCOItU6qZTxpMKrQdVU6BIFSnERZ4ouHe1oGRdFYiCS/Ryc2CeNLrZQA vpaxOWlUlusShAYzaTJAUjUJLF7JWFg== X-Google-Smtp-Source: AGHT+IGHBXrJf7adtnMHehAiCy7D06H37KjO/MJSIvMRJgUN6k+MZp8cQmhALad56QHuWTulh79GcJrdsMA3vLp9G3o= X-Received: by 2002:a05:6102:1344:b0:4af:ed5a:b68d with SMTP id ada2fe7eead31-4afed5aca05mr3290149137.6.1733756111608; Mon, 09 Dec 2024 06:55:11 -0800 (PST) MIME-Version: 1.0 From: Josep Bigorra Date: Mon, 9 Dec 2024 15:55:00 +0100 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::e2c; envelope-from=jjbigorra@gmail.com; helo=mail-vs1-xe2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 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 From 9ac032ab3228f461467b63a164b76b3545b1bcf2 Mon Sep 17 00:00:00 2001 Message-ID: <9ac032ab3228f461467b63a164b76b3545b1bcf2.1733755906.git.jjbigorra@gmail.com> From: Josep Bigorra Date: Mon, 9 Dec 2024 15:50:43 +0100 Subject: [PATCH] attempt to update docker to v27 --- gnu/packages/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b49dc58bd0..0798fd7285 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -55,7 +55,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 "27.3.1") (define-public python-docker (package @@ -350,7 +350,7 @@ (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" + (substitute* "builder/builder-next/executor_linux.go" (("CommandCandidates:.*runc.*") (string-append "CommandCandidates: []string{\"" (search-input-file inputs "/sbin/runc") -- 2.46.0 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: arthurhdrodrigues--- 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: arthurhdrodrigues--- 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 From patchwork Wed May 21 14:35:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arthurhdrodrigues--- via Guix-patches via X-Patchwork-Id: 42835 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 22B4E27BC4C; Wed, 21 May 2025 15:36:32 +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 44FFF27BC49 for ; Wed, 21 May 2025 15:36:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHkYH-0003e9-5g; Wed, 21 May 2025 10:36:13 -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 1uHkY6-0003di-RO for guix-patches@gnu.org; Wed, 21 May 2025 10:36: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 1uHkY6-0004Ve-CB for guix-patches@gnu.org; Wed, 21 May 2025 10:36: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=8gWpJnfvWsAw+lkxy72j5vFU6cmVJxQ2zdtWyXEOvr8=; b=D9kPT5d9gulLvP1NF193AA5yhe6JDFxNFqN7TApX7a7dsPOQzVc/bAZLoeQLksfkWthSn4NbKRG/WJKDv3nsmGFkkqwCA78qL1AP+ieDdVovD73/+N6+edfNKeXRb78RfJJkIYX3dAlItxENjQ3vpvrpI0ihQQ1wfFYVW6dbzfmSfde9ysBnTrxraElWhRd3/CIREV3DHv3KGiNn4BT0KWso09oQ3+D4MMom+vbWeDvWbzO2gWyE4pn5hXzyWg988rYDkKNMgHY4mVEwSvBkTUS3j4RCp5JTA5gGQuUrs8etn+vKH79ZT6tL7tAoq6BpOTUqXu4hVkYP+pDJ3rlNHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHkY6-0001xv-48 for guix-patches@gnu.org; Wed, 21 May 2025 10:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 3/5] gnu: docker: Update substitutions in patch-paths phase 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:36: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.17478381597536 (code B ref 74746); Wed, 21 May 2025 14:36:02 +0000 Received: (at 74746) by debbugs.gnu.org; 21 May 2025 14:35:59 +0000 Received: from localhost ([127.0.0.1]:49986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHkY1-0001xI-VJ for submit@debbugs.gnu.org; Wed, 21 May 2025 10:35:59 -0400 Received: from mail-106101.protonmail.ch ([79.135.106.101]:21775) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHkXy-0001wY-At for 74746@debbugs.gnu.org; Wed, 21 May 2025 10:35:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1747838147; x=1748097347; bh=8gWpJnfvWsAw+lkxy72j5vFU6cmVJxQ2zdtWyXEOvr8=; 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=X+OQKJDlpG+4p2ctpmRw4CibU4WOTy6ejiNERaVmArvrwA7SIyBXkOftOJKsNBdej 4xD0/+slsn5e0J9v888eQWBpvxkXIF/OTS8RJYhCnrZFXB9801cbRFGJqa0K979Snm uNDCA2IU7yDqQjp7qUkPJgTi8Z5EiBHqDvakRiKdjXwRzIWmcELtF/dVNVBRlzJ4p8 TDrPRVBl/LEeUNzW6yYWHo7Sjv2GgMvgrZCYYkmUzZPZSSPcRHykjq4rb599T+5AFB n9g+wV77owD1i/LZNMbKk/D5iEI1Ur5UfKJtYbftZFlTyP6XHizOhFi8Y6+JMNbcas deA8Rdce7gsVg== Date: Wed, 21 May 2025 14:35:43 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: 83d3de5eefe8d2bd0fafb29b2c1bdaeda989a4a6 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: arthurhdrodrigues--- 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: 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"))) From patchwork Wed May 21 14:36:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arthurhdrodrigues--- via Guix-patches via X-Patchwork-Id: 42836 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 5E1A327BC4C; Wed, 21 May 2025 15:37:23 +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 C75F827BC49 for ; Wed, 21 May 2025 15:37:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHkZ6-0003ls-85; Wed, 21 May 2025 10:37: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 1uHkZ4-0003ld-BM for guix-patches@gnu.org; Wed, 21 May 2025 10:37:02 -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 1uHkZ4-0004cA-0T for guix-patches@gnu.org; Wed, 21 May 2025 10:37: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=IeLOWwg2Oyl4wY1i6qRuSx/6tgHXV4zu6Jk80K3/HCo=; b=Nv6Wxaf1WoY7PfrTz3Q8HLyko4Z9SLqop0BOjvC5ExhEleA9XD1RH9QOs/Fs2Eg4AoBQCg4nSgeXbiMzA2ojHrglmYN7/1HTMcQlQbB6g3FkqXAzRpsfIbUNIIX0BTxA+bWJayJeqLzsvEYyrR3+d/vMUKCt3v7Mx7pB7BycRPsO/j5eiXCXLX8NlyFiEtoy93Id8eBVmG4N3mQG06NJDRqoRfuDpZeAhLQ2X1vHLWANHeKWUXYN65PDsK2G7kw/2t02ufDLRGKfpRTsVnm9GdoewbEpKYSPHbPLDd1FQJ8tqUi7gWIKK9+D+eae+sI/HIO54khvYdHCsGiww99Imw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHkZ3-00022n-NG for guix-patches@gnu.org; Wed, 21 May 2025 10:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 4/5] gnu: docker: Avoid build failing when looking for buildkit in PATH 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:37:01 +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.17478382087811 (code B ref 74746); Wed, 21 May 2025 14:37:01 +0000 Received: (at 74746) by debbugs.gnu.org; 21 May 2025 14:36:48 +0000 Received: from localhost ([127.0.0.1]:50003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHkYq-00021p-37 for submit@debbugs.gnu.org; Wed, 21 May 2025 10:36:48 -0400 Received: from mail-106102.protonmail.ch ([79.135.106.102]:58107) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHkYm-00020w-L2 for 74746@debbugs.gnu.org; Wed, 21 May 2025 10:36:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1747838197; x=1748097397; bh=IeLOWwg2Oyl4wY1i6qRuSx/6tgHXV4zu6Jk80K3/HCo=; 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=a9KZ5UQiWIQdcoB709Zvq8QP9RbjhMe/rzW1ibqEK7GVOyFyXv7xBoM4klhKaaHSJ OaSI5/IrYiqIabTVJy7BpYSpmHxc5KwjLsijIc5AGIuB20KoX2e1aL3LsJ1ZtQWgUc HlaS1VYW84hmWsePL3D5KQNIrZ1EePxF6EAw9Oq/Qc7W0sXtOhZ9L5DGk527wWDidd 2YKZSC2/wehrbNvmNjx5zWpD28ewDsT2C0tFeGXPQGwcQMEvVkNOasAbmyxSiO3T1/ +xkiIo+nn2pHur2nqK+vBgdxRoa3+LIdCVJNApQQEhwyox70265PxrtJMG9QKS3wxq ypqw6yRrwQPcA== Date: Wed, 21 May 2025 14:36:34 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: 2359fbef34990116c0ce8666a77e88530c442854 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: arthurhdrodrigues--- 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: 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. (("\\ isn't found. - ;; FIXME: We might need to package buildkit and docker's - ;; buildx plugin, to support qemu-based docker containers. - (("\\ isn't found. + ;; FIXME: We might need to package buildkit and docker's + ;; buildx plugin, to support qemu-based docker containers. + (("\\ X-Patchwork-Id: 42837 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 7E67327BC4C; Wed, 21 May 2025 15:38: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 CAFCD27BC49 for ; Wed, 21 May 2025 15:38:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHka6-0003us-BG; Wed, 21 May 2025 10:38:06 -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 1uHka3-0003uL-0s for guix-patches@gnu.org; Wed, 21 May 2025 10:38: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 1uHka2-0004l4-MP for guix-patches@gnu.org; Wed, 21 May 2025 10:38: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=rkZt0tyOq4cyflCng0hSUSmIT69p87mlKKWjugGzSC0=; b=bq3CS9hW9Qn0PGrYLTtOwVvM5kBzqjSh4ZwMrMBMa03JVWdZcEBK6+3phehJYBKZTUi7RsqWUtHZ2yZzgaC9x6WGXnDOyJ9d19Xa4rUowQq5SM1P+ZDD6ZP9lHgmrxHKuyEGnZr3aGH6t84fBq/hX37CjXwsxczP0PXOVm+8Q3PWoyMAK+XA93+t+nlkG53ZlqhPagFhQ67oDayNVZKZ2VBp2V78Sa00z8WcORUIP5boAuUrJNCBLJRE7RuuAToGU0MC4LqittdbCW4QKg2qWLB4vM4xNgNl4qU9qsz0ceRgen7NNRxL+2OoGBGkwNmRPKDap+5beo3P+wsPVrjbKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHka2-000271-EQ for guix-patches@gnu.org; Wed, 21 May 2025 10:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 5/5] gnu: docker: Remove docker- from out-bin 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:38: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.17478382547996 (code B ref 74746); Wed, 21 May 2025 14:38:02 +0000 Received: (at 74746) by debbugs.gnu.org; 21 May 2025 14:37:34 +0000 Received: from localhost ([127.0.0.1]:50017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHkZZ-00024r-BU for submit@debbugs.gnu.org; Wed, 21 May 2025 10:37:33 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:22981) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHkZU-00023w-Lt for 74746@debbugs.gnu.org; Wed, 21 May 2025 10:37:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1747838242; x=1748097442; bh=rkZt0tyOq4cyflCng0hSUSmIT69p87mlKKWjugGzSC0=; 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=kNtGX+0Ok1e2cl3PMAXHj4iStDNn/3qAVBJsHdjN0DfScC9ovvgHSvDGsmd5LLW2i 5qF0hMgenFPOk6y0ZvuOC/I1cFyDkpDZ5rQHmuOCTQHT66DvAw5NXQLVIN4vOQpvHJ YJpu4Z4JgdwdfUJtyGtKaboZmw+zLl0ssLxVSd4cZizwBfVYAfvKGJ8DrwSSGZSdTu OzvtFhdfke4RQ2RIG58WxJUyveZKxcMlRzmFVnoc5uRyyGIN2eGw+pyZaX2WgbJfp/ kfYbAxRPs+GjBClUqkA5cA3VyrKSGg9DrSfM/5yp4D02Y4Qqqr10NlQeckWlIzlLng DXoqVDg5Ofaew== Date: Wed, 21 May 2025 14:37:18 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: 2122161b775331f66564c9b0a1d7fc8953ba0afa 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: arthurhdrodrigues--- 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: 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