Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Adds UIDMap and GIDMap to containerConfig #14

Merged
merged 4 commits into from
Dec 11, 2024
+17 −1
Merged

feat: Adds UIDMap and GIDMap to containerConfig #14

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06fb8a7
doc: fixed typo in flake.nix rootless how example
ShockWave-1 Dec 9, 2024
560ebcf
feat: add gidMap option to containerConfig
ShockWave-1 Dec 9, 2024
3663834
feat: add uidMap to containerConfig
ShockWave-1 Dec 9, 2024
027a79f
feat: changed gid/uidMap functions plural and subsequently changed ty…
ShockWave-1 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ See [`container.nix`](./container.nix), [`network.nix`](./network.nix), and [`po
quadlet-nix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { nixpkgs, quadlet-nix, home-manager, ... }@attrs: {
nixosConfigurations.machine = nixpksg.lib.nixosSystem {
nixosConfigurations.machine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
Expand Down
16 changes: 16 additions & 0 deletions container.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ let
description = "--user UID:...";
property = "Group";
};

gidMap = quadletUtils.mkOption {
type = types.nullOr types.str;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This key can be listed multiple times.

https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html#gidmap.

Let's make it a list and have a plural name.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made the suggested changes. Their now lists and have plural names.

default = null;
example = "0:10000:10";
description = "--gidmap";
property = "GIDMap";
};

healthCmd = quadletUtils.mkOption {
type = types.nullOr types.str;
Expand Down Expand Up @@ -449,6 +457,14 @@ let
property = "Tmpfs";
};

uidMap = quadletUtils.mkOption {
type = types.nullOr types.str;
default = null;
example = "0:10000:10";
description = "--uidmap";
property = "UIDMap";
};

user = quadletUtils.mkOption {
type = types.nullOr types.str;
default = null;
Expand Down
Loading