From 0a6ced660d049298baa7844cd85297d886b33d78 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Tue, 6 Feb 2024 15:24:12 +0100 Subject: [PATCH] Doesn't seem to work, let's remove podman from this and just use global package --- flake.nix | 5 ---- podman/.envrc | 1 - podman/LICENSE | 21 ---------------- podman/flake.lock | 61 ----------------------------------------------- podman/flake.nix | 59 --------------------------------------------- 5 files changed, 147 deletions(-) delete mode 100644 podman/.envrc delete mode 100644 podman/LICENSE delete mode 100644 podman/flake.lock delete mode 100644 podman/flake.nix diff --git a/flake.nix b/flake.nix index 1f37d9d..9d25637 100644 --- a/flake.nix +++ b/flake.nix @@ -160,11 +160,6 @@ description = "PHP development environment"; }; - podman = { - path = ./podman; - description = "Podman OCI container development environment"; - }; - protobuf = { path = ./protobuf; description = "Protobuf development environment"; diff --git a/podman/.envrc b/podman/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/podman/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/podman/LICENSE b/podman/LICENSE deleted file mode 100644 index fa823c1..0000000 --- a/podman/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 jyukopla - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/podman/flake.lock b/podman/flake.lock deleted file mode 100644 index 29dff31..0000000 --- a/podman/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/podman/flake.nix b/podman/flake.nix deleted file mode 100644 index a36c5cd..0000000 --- a/podman/flake.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - description = "Rootless Podman"; - - inputs = { - flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; - }; - - outputs = { - self, - nixpkgs, - flake-utils, - ... - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - # echo "username:100000:65536">>/etc/subuid - # echo "username:100000:65536">>/etc/subgid - - devShells.default = pkgs.mkShell { - buildInputs = [ - pkgs.podman # CLI - pkgs.podman-compose # compose tools - pkgs.runc # Container runtime - pkgs.conmon # Container runtime monitor - pkgs.skopeo # Interact with container registry - pkgs.slirp4netns # User-mode networking - ]; - shellHook = let - podmanSetupScript = let - policyConf = pkgs.writeText "policy.conf" '' - {"default":[{"type":"insecureAcceptAnything"}],"transports":{"docker-daemon":{"":[{"type":"insecureAcceptAnything"}]}}} - ''; - registriesConf = pkgs.writeText "registries.conf" '' - [registries] - [registries.block] - registries = [] - [registries.insecure] - registries = [] - [registries.search] - registries = ["docker.io", "quay.io"] - ''; - in - pkgs.writeScript "podman-setup" '' - #!${pkgs.runtimeShell} - if ! test -f ~/.config/containers/policy.json; then - install -Dm555 ${policyConf} ~/.config/containers/policy.json - fi - if ! test -f ~/.config/containers/registries.conf; then - install -Dm555 ${registriesConf} ~/.config/containers/registries.conf - fi - ''; - in '' - ${podmanSetupScript} - ''; - }; - }); -}