From patchwork Wed May 21 14:37:18 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: 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