From patchwork Sun Dec 19 04:58:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35466 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 4C51027BBEA; Sun, 19 Dec 2021 05:00:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 112DD27BBE9 for ; Sun, 19 Dec 2021 05:00:46 +0000 (GMT) Received: from localhost ([::1]:40678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoJR-0007xp-7c for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:00:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIl-0007u2-1f for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIk-0003wo-Nf for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myoIk-0002Hs-Md for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 2/6] gnu: add conmon Resent-From: Timmy Douglas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 05:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52174 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52174@debbugs.gnu.org Cc: ludo@gnu.org, mail@timmydouglas.com Received: via spool by 52174-submit@debbugs.gnu.org id=B52174.16398899878650 (code B ref 52174); Sun, 19 Dec 2021 05:00:02 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:47 +0000 Received: from localhost ([127.0.0.1]:44685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIV-0002FS-4X for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:47 -0500 Received: from out0.migadu.com ([94.23.1.103]:14904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIT-0002FE-6H for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:45 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timmydouglas.com; s=key1; t=1639889984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BM2Y2fPPvSdWnlHhqofuDzFIEuic9hbBgCHXT3OnfIo=; b=islOgnzZGuUYtZFQZOcQe4KOs0IlNwOFYGuMJnTbL0Il73BXCx3zggvF7dbX1LjqMDR58c JdiwzWh77ASbpnJQgHF77p08YjKpUx43/mu/SKBBCJNp7TC4gUl0rMV5sSt/7K1Om7/MUt rttc6a9K4xV4cchmJb5fy4CbVTXO7E4= Date: Sat, 18 Dec 2021 20:58:27 -0800 Message-Id: <058f226cf4e0b5fdb6642ff4b9d20e28b5312781.1639889841.git.mail@timmydouglas.com> In-Reply-To: <874k75pzi7.fsf@gnu.org> References: <874k75pzi7.fsf@gnu.org> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: timmydouglas.com 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" Reply-to: Timmy Douglas X-ACL-Warn: , Timmy Douglas via Guix-patches X-Patchwork-Original-From: Timmy Douglas via Guix-patches via From: Timmy Douglas X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm: add conmon --- gnu/packages/containers.scm | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 7ffe6e95d0..d4f9d742db 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -85,3 +85,45 @@ (define-public crun (description "crun is a fast and low-memory footprint OCI Container Runtime fully written in C.") (license license:gpl2+)))) + +(define-public conmon + (package + (name "conmon") + (version "2.0.30") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/conmon") + (commit (string-append "v" version)))) + (sha256 + (base32 "1sxpbm01g4xak4kqwvk45gmzr6n9bjzlfp1j85wyz8rj2hg2x4rm")) + (file-name (git-file-name name version)))) + + (build-system gnu-build-system) + (arguments + `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output)) + #:tests? #f ; currently broken as go tries to use network + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda* (#:key inputs #:allow-other-keys) + ;; when running go, things fail because + ;; HOME=/homeless-shelter. + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test"))))))) + (inputs + (list glib glibc libseccomp crun)) + (native-inputs + (list git go pkg-config)) + (home-page "https://github.com/containers/conmon") + (synopsis "Monitoring and communication tool between container manager and OCI runtime") + (description + "Conmon is a monitoring program and communication tool between a container +manager (like Podman or CRI-O) and an OCI runtime (like runc or crun) for a +single container.") + (license license:asl2.0)))