From patchwork Sun Dec 19 04:58:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35468 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 CF4AD27BBE9; Sun, 19 Dec 2021 05:03:58 +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 CFA5727BBEA for ; Sun, 19 Dec 2021 05:03:54 +0000 (GMT) Received: from localhost ([::1]:44844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoMU-0002Ty-0O for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:03:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIk-0007u1-RB for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIk-0003wW-9C 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-0002Hf-7P for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 1/6] gnu: add crun 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.16398899688610 (code B ref 52174); Sun, 19 Dec 2021 05:00:02 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:28 +0000 Received: from localhost ([127.0.0.1]:44681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIA-0002Em-4T for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:28 -0500 Received: from out0.migadu.com ([94.23.1.103]:14716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoI6-0002Eb-7p for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:25 -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=1639889960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KK90Y55LmAoJr7B9rHV7wD1IUGk+ufq6La7PrUBqBl4=; b=OZuMbBxJYYpYs1zQW79vwDNFb9XrligLnBScXVxBruzNmnMQgs6Lytim/nxB0dns+Peb+W Iirn+OaL/Q/n9LVx+BBcp42tFOfue7gSVVdFNhAQOha0YdU8Om545WMg+RoaH4VqoXripB HqNWZbGx2wNIt/eYubnMT2/bKb1NdkY= Date: Sat, 18 Dec 2021 20:58:26 -0800 Message-Id: <52542aec3c127a893453ac1ecbbd504022d4c8dd.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: new file * gnu/local.mk: add containers.scm --- gnu/local.mk | 1 + gnu/packages/containers.scm | 87 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 gnu/packages/containers.scm diff --git a/gnu/local.mk b/gnu/local.mk index 33e108c752..8ffcf662ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -157,6 +157,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/configuration-management.scm \ %D%/packages/conky.scm \ %D%/packages/connman.scm \ + %D%/packages/containers.scm \ %D%/packages/convmv.scm \ %D%/packages/cook.scm \ %D%/packages/coq.scm \ diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm new file mode 100644 index 0000000000..7ffe6e95d0 --- /dev/null +++ b/gnu/packages/containers.scm @@ -0,0 +1,87 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Timmy Douglas +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages containers) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) + #:use-module (guix build-system meson) + #:use-module (guix utils) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) + #:use-module (gnu packages linux) + #:use-module (gnu packages python) + #:use-module (gnu packages networking) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages selinux) + #:use-module (gnu packages version-control) + #:use-module (gnu packages virtualization) + #:use-module (gnu packages web)) + +(define-public crun + (let ((commit "8e5757a4e68590326dafe8a8b1b4a584b10a1370")) + (package + (name "crun") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/crun") + (commit commit) + (recursive? #t))) + (sha256 + (base32 "01yiss2d57kwlxb7zlqzjwlg9fyaf19yjngd1mw9n4hxls3dfj3k")) + (file-name (git-file-name name version)))) + + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:configure-flags '("--disable-systemd") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-depend-on-git + (lambda _ + (substitute* "autogen.sh" + (("^git submodule update.*") + "")) + (with-output-to-file "git-version.h" + (lambda () + (display (string-append + "/* autogenerated. */\n#ifndef GIT_VERSION\n# define GIT_VERSION \"" + ,commit + "\"\n#endif\n")))) + #t))))) + (inputs + (list libcap libseccomp libyajl)) + (native-inputs + (list automake autoconf git libtool pkg-config python-3)) + (home-page "https://github.com/containers/crun") + (synopsis "OCI Container runtime") + (description + "crun is a fast and low-memory footprint OCI Container Runtime fully written in C.") + (license license:gpl2+)))) 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))) From patchwork Sun Dec 19 04:58:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35469 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 3040627BBEA; Sun, 19 Dec 2021 05:04:04 +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 EFD2E27BBE9 for ; Sun, 19 Dec 2021 05:04:03 +0000 (GMT) Received: from localhost ([::1]:45270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoMd-0002nB-5I for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:04:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIl-0007uE-Eb for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIl-0003xT-4T for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myoIl-0002Hz-3O for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 3/6] gnu: add libslirp Resent-From: Timmy Douglas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 05:00:03 +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.16398899918682 (code B ref 52174); Sun, 19 Dec 2021 05:00:03 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:51 +0000 Received: from localhost ([127.0.0.1]:44690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIZ-0002Fx-Cf for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:51 -0500 Received: from out0.migadu.com ([94.23.1.103]:14914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIU-0002FL-IL for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:46 -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=1639889986; 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=MoPthzUoWVr24q8C/71I+tgqVDDRXMASADHcLc645/8=; b=Ql+yliKVAem+Lake/kiI1VDTg1YXZUYYJrkUjr76Wxu6OOxV/dSyHYVO4lByKbcz0/EdLj I5oxyJ6ShLSLux6iurOO/H7Wwao6LfVCyrlSWeoxOK64UxAeje7w6h90OStGKm4XLLbqK5 PET2g+mUN707O8gIOegimCa1EXAFQ4k= Date: Sat, 18 Dec 2021 20:58:28 -0800 Message-Id: <494f640fc1a93f5b04d4f39692af3b831998d085.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 libslirp --- gnu/packages/containers.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index d4f9d742db..777eaa2eb9 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -127,3 +127,30 @@ (define-public conmon manager (like Podman or CRI-O) and an OCI runtime (like runc or crun) for a single container.") (license license:asl2.0))) + +(define-public libslirp + (package + (name "libslirp") + (version "4.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/slirp/libslirp") + (commit (string-append "v" version)))) + (sha256 + (base32 "1b4cn51xvzbrxd63g6w1033prvbxfxsnsn1l0fa5i311xv28vkh0")) + (file-name (git-file-name name version)))) + + (build-system meson-build-system) + (arguments '(#:tests? #f)) + (inputs + (list glib)) + (native-inputs + (list pkg-config)) + (home-page "https://gitlab.freedesktop.org/slirp/libslirp") + (synopsis "User-mode networking library") + (description + "libslirp is a user-mode networking library used by virtual machines, +containers or various tools.") + (license license:bsd-3))) From patchwork Sun Dec 19 04:58:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35467 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 71A0827BBEA; Sun, 19 Dec 2021 05:02:53 +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 3884C27BBE9 for ; Sun, 19 Dec 2021 05:02:53 +0000 (GMT) Received: from localhost ([::1]:43566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoLU-0001d8-CX for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:02:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIl-0007ua-Rd for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIl-0003xg-H1 for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myoIl-0002I7-GY for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 4/6] gnu: add slirp4netns Resent-From: Timmy Douglas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 05:00:03 +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.16398899928689 (code B ref 52174); Sun, 19 Dec 2021 05:00:03 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:52 +0000 Received: from localhost ([127.0.0.1]:44692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIZ-0002Fz-Lu for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:51 -0500 Received: from out0.migadu.com ([94.23.1.103]:14929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIW-0002Fa-0h for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:48 -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=1639889987; 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=SCTA18D/pP28POQBZM9IsuNcFTg3hhSyK5TFtEmH5a8=; b=djH12t4nlGnrleS+b3bz3rvEmuzv9LbPoH/vdQ6wdvUaiY1vYMgOsxKaL8dvgo14b3fmyg OdSVoNaH0qIz0EmYF0TxYCHFpe35/LjX1iVNl+1F7kfgyzmtBL1JI6N+fBZZryQvpz6Je5 aAV5cQYnu3siWeMqE/YQ9zU613orGP4= Date: Sat, 18 Dec 2021 20:58:29 -0800 Message-Id: <5c1a99e39b736f68c55669842cf68c08180a8086.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 slirp4netns --- gnu/packages/containers.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 777eaa2eb9..f13da74ac1 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -154,3 +154,29 @@ (define-public libslirp "libslirp is a user-mode networking library used by virtual machines, containers or various tools.") (license license:bsd-3))) + +(define-public slirp4netns + (package + (name "slirp4netns") + (version "1.1.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rootless-containers/slirp4netns") + (commit (string-append "v" version)))) + (sha256 + (base32 "03llv4dlf7qqxwz4zdyk926g4bigfj2gb50glm70ciflpvzs8081")) + (file-name (git-file-name name version)))) + + (build-system gnu-build-system) + (arguments '(#:tests? #f)) + (inputs + (list glib libcap libseccomp libslirp)) + (native-inputs + (list automake autoconf pkg-config)) + (home-page "https://github.com/rootless-containers/slirp4netns") + (synopsis "User-mode networking for unprivileged network namespaces") + (description + "slirp4netns provides user-mode networking (\"slirp\") for unprivileged network namespaces.") + (license license:gpl2+))) From patchwork Sun Dec 19 04:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35470 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 03BA927BBEA; Sun, 19 Dec 2021 05:04:17 +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 C402D27BBE9 for ; Sun, 19 Dec 2021 05:04:16 +0000 (GMT) Received: from localhost ([::1]:45686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoMp-00034c-Vr for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:04:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIm-0007v2-8U for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIl-0003xp-U9 for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myoIl-0002IE-TZ for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 5/6] gnu: add cni-plugins Resent-From: Timmy Douglas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 05:00:03 +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.16398899928696 (code B ref 52174); Sun, 19 Dec 2021 05:00:03 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:52 +0000 Received: from localhost ([127.0.0.1]:44694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIZ-0002G6-Vr for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:52 -0500 Received: from out0.migadu.com ([94.23.1.103]:14942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIX-0002Fi-DA for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:49 -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=1639889988; 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=oECVdv+e1yauqVf8mTuriDeMu8OO1ZM8zuxq23DemSY=; b=cTuOzdTdwaNIgAIki/Hrh4CaGn2ERMaG4j+9yiAy0Mvqjzm26JfUg4tpxa094TUCCm3gAB ca5aoKVvjpioZ5+wHsUIDnV5yGWgYQTpfi8LmjBLxU5u/cYrJNuqBRCah+InNkdwQ6uulG uWR6XO36sMx3r7FIqQh/HN9c4hEra8I= Date: Sat, 18 Dec 2021 20:58:30 -0800 Message-Id: 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 cni-plugins --- gnu/packages/containers.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index f13da74ac1..8810ecb8c8 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -180,3 +180,37 @@ (define-public slirp4netns (description "slirp4netns provides user-mode networking (\"slirp\") for unprivileged network namespaces.") (license license:gpl2+))) + +(define-public cni-plugins + (package + (name "cni-plugins") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containernetworking/plugins") + (commit (string-append "v" version)))) + (sha256 + (base32 "1j91in0mg4nblpdccyq63ncbnn2pc2zzjp1fh3jy0bsndllgv0nc")) + (file-name (git-file-name name version)))) + + (build-system go-build-system) + (arguments + `(#:unpack-path "github.com/containernetworking/plugins" + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/containernetworking/plugins" + (invoke "./build_linux.sh")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "src/github.com/containernetworking/plugins/bin" + (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (home-page "https://github.com/containernetworking/plugins") + (synopsis "CNI network plugins") + (description + "Some CNI network plugins, maintained by the containernetworking team.") + (license license:asl2.0))) From patchwork Sun Dec 19 04:58:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timmy Douglas X-Patchwork-Id: 35471 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 7431327BBEA; Sun, 19 Dec 2021 05:04:26 +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 2F0C227BBE9 for ; Sun, 19 Dec 2021 05:04:26 +0000 (GMT) Received: from localhost ([::1]:46108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myoMz-0003PM-Bv for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 00:04:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myoIm-0007v5-Lo for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myoIm-0003xy-C1 for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myoIm-0002IL-B5 for guix-patches@gnu.org; Sun, 19 Dec 2021 00:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52174] [PATCH v2 6/6] gnu: add podman Resent-From: Timmy Douglas Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 05:00:04 +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.16398899988708 (code B ref 52174); Sun, 19 Dec 2021 05:00:04 +0000 Received: (at 52174) by debbugs.gnu.org; 19 Dec 2021 04:59:58 +0000 Received: from localhost ([127.0.0.1]:44696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIg-0002GO-AI for submit@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:58 -0500 Received: from out0.migadu.com ([94.23.1.103]:14955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myoIY-0002Fq-PB for 52174@debbugs.gnu.org; Sat, 18 Dec 2021 23:59:51 -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=1639889990; 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=UPqIzWwJYWjGadP57UanotjJm3E1aNKeFpSjM8tQucg=; b=WCrOLLdyL2PH4GnTXUDSTjJQ1hh/LEZ5EJIgpIV5Stvb4vGv2hlWVWro1hQ0KHoB33ZPeU ZYGuXqDy/VybPcJ4Lfb6u+KZSZ97Ei0j86Z4NdJ2fAeWfrLFwtTPwFo5GLcwJGy5cN7JMv TbCLFnXle0IM0Oauu/SI16KakIRItEE= Date: Sat, 18 Dec 2021 20:58:31 -0800 Message-Id: <5d39e8142d916df8da9d317bf7a3781c0513ad77.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 podman --- Thanks for the review Ludo! Hopefully this v2 fixes the issues you pointed out. gnu/packages/containers.scm | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 8810ecb8c8..389ef42092 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -214,3 +214,63 @@ (define-public cni-plugins (description "Some CNI network plugins, maintained by the containernetworking team.") (license license:asl2.0))) + +;; For podman to work, the user needs to run +;; `sudo mount -t cgroup2 none /sys/fs/cgroup` + +(define-public podman + (package + (name "podman") + (version "3.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman") + (commit (string-append "v" version)))) + (sha256 + (base32 "1q09qsl1wwiiy5njvb97n1j5f5jin4ckmzj5xbdfs28czb2kx3g5")) + (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 ; need to setup ginkgo + #: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"))) + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* (find-files "libpod" "\\.go") + (("exec.LookPath[(][\"]slirp4netns[\"][)]") + (string-append "exec.LookPath(\"" (which "slirp4netns") "\")"))) + (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" + (("/usr/local/libexec/podman") + (string-append (assoc-ref %outputs "out") "/bin"))) + (substitute* "vendor/github.com/containers/common/pkg/config/default.go" + (("/usr/libexec/podman/conmon") (which "conmon")) + (("/usr/local/libexec/cni") + (string-append (assoc-ref %build-inputs "cni-plugins") "/bin")) + (("/usr/bin/crun") (which "crun"))) + #true)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test"))))))) + (inputs + (list btrfs-progs cni-plugins conmon crun gpgme go-github-com-go-md2man + iptables libassuan libseccomp libselinux slirp4netns)) + (native-inputs + (list git go pkg-config)) + (home-page "https://podman.io") + (synopsis "Manage containers, images, pods, and their volumes") + (description + "Podman (the POD MANager) is a tool for managing containers and images, +volumes mounted into those containers, and pods made from groups of +containers.") + (license license:asl2.0)))