Commit graph

2080 commits

Author SHA1 Message Date
Maximilian Bosch
9cd14670ad
nixos/oci-containers: escape login.username
When using e.g. GitLab as container registry, the token name may be the
username. However, the token name can contain special characters
including spaces breaking the registry login like this:

    Apr 25 15:35:48 test42 pre-start[294091]: image doesn't exist locally and login failed
    Apr 25 15:35:52 test42 pre-start[294289]: Error: accepts at most 1 arg(s), received 2
    Apr 25 15:35:52 test42 pre-start[294297]: Error: registry.example.com/foo/bar/baz: image not known

Applying `escapeShellArg` on it fixes the problem.
2025-04-25 15:39:00 +02:00
jopejoe1
e6d927fcfd
cloudstack: add to image/images (#398556) 2025-04-24 19:03:53 +02:00
jopejoe1
326702f8bb
Use mkImageMediaOverride for filesystem attributes of various images (#397330) 2025-04-24 18:54:06 +02:00
lassulus
b8d7097244
nixos/containers: fix shell error when privateUsers=no (#396174) 2025-04-18 17:53:51 -07:00
Aleksana
af39bcec09
gce-images: drop (#396780) 2025-04-17 09:49:14 +08:00
phaer
d7e76ed0a2 cloudstack: add to image/images
This was an oversight in https://github.com/NixOS/nixpkgs/pull/347275,
so it's currently missing from the variants listed in nixos-rebuild build-image
2025-04-14 14:03:58 +02:00
phaer
887f7d33e0 virtualisation/openstack: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant openstack-zfs --flake .#my-host`
2025-04-11 14:33:45 +02:00
phaer
6f83796aa5 virtualisation/google-compute-config: use mkImageMediaOverride...
...for filesystem and bootloader options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant google-compute-config --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
bf2b3f0286 virtualisation/digital-ocean-config: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant digital-ocean --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
a79571b081 virtualisation/azure-image: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant azure --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
2f7435b5ca virtualisation/hyperv-image: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant hyperv --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
61ba044658 virtualisation/oci-common: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant common --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
2742c7163a virtualisation/kubevirt: use mkImageMediaOverride...
...for filesystem  options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant kubevirt --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
4327e179f7 virtualisation/virtualbox-image: use mkImageMediaOverride...
...for filesystem and options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant virtualbox --flake .#my-host`
2025-04-11 12:54:12 +02:00
phaer
864030e5e8 virtualisation/vmware-image: use mkImageMediaOverride...
...for filesystem options. Before this change, users would typically encounter conflicting option definitions when trying to build an image for a generic nixos closure, i.e. `nixos-rebuild build-image --image-variant vmware --flake .#my-host`
2025-04-11 12:54:11 +02:00
phaer
c5d383a797 virtualisation/disk-image: use mkImageMediaOverride...
...for filesystem options. Before this change, users would typically encounter conflicting option definitions when trying to build an image for a generic nixos closure, i.e. `nixos-rebuild build-image --image-variant qemu --flake .#my-host`
2025-04-11 12:54:11 +02:00
phaer
3718f356c0 virtualisation/promxox-image: use mkImageMediaOverride...
...for filesystem options. Before this change,
users would typically encounter conflicting option definitions
when trying to build an image for a generic nixos closure, i.e.
`nixos-rebuild build-image --image-variant proxmox --flake .#my-host`
2025-04-11 12:54:11 +02:00
phaer
ae02740156 virtualisation/proxmox-image: remove obsolete proxmox.qemuConf.diskSize usage
This was an oversight in my commit
d37a3ea1ef, and results in the following
eval warning when proxmox images are used: `Obsolete option
`proxmox.qemuConf.diskSize' is used. It was renamed to
`virtualisation.diskSize'.`
2025-04-11 12:54:11 +02:00
phaer
9e704d7263 virtualisation/linode-config: use mkImageMediaOverride...
...for filesystem options. Before this change, users would typically encounter conflicting option definitions when trying to build an image for a generic nixos closure, i.e. `nixos-rebuild build-image --image-variant linode --flake .#my-host`
2025-04-11 12:54:11 +02:00
phaer
a80eca86d5 virtualisation/linode-config: drop "with; lib" 2025-04-11 12:35:41 +02:00
Franz Pletz
70f67d28f7
nixos/virtualisation: add contents setting to googleComputeImage (#393749) 2025-04-09 13:55:55 +02:00
Adam Chance
38f2ca6b80 nixos/virtualisation: add contents setting to googleComputeImage
Allow placing files and directories in the image
2025-04-08 11:33:50 +01:00
phaer
8bdc44ec9a gce-images: drop
It's hopefully out-dated, "latest" release points to 20.09 and no
in-tree usage could be found. Feel free to update and re-introduce if
needed.
2025-04-07 11:22:52 +02:00
Louis Opter
9d3a171dbf nixos/containers: fix shell error when privateUsers=no
Details in #387773.
2025-04-05 00:36:42 +00:00
Adam C. Stephens
21197daa39
incus: build and expose documentation 2025-04-03 16:00:08 +00:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Adam C. Stephens
62d611a22b
nixos/incus: add AppArmor rules (#386060) 2025-04-01 12:51:34 -04:00
Adam C. Stephens
9ff6900615
incus: 6.10.1 -> 6.11.0
https://discuss.linuxcontainers.org/t/incus-6-11-has-been-released/23322
https://github.com/lxc/incus/releases/tag/v6.11.0
2025-03-28 16:58:33 -04:00
MakiseKurisu
9b7d65ad87
nixos/incus: add AppArmor rules to allow access to Nix store
Fix #350012
2025-03-26 21:01:14 +08:00
Arian van Putten
12c098f0ca nixos/amazon-ec2-amis: remove 2025-03-22 12:25:18 +00:00
Robert Hensing
202ac0e3d2
nixos: Cut off virtualisation.vmVariant.virtualisation.vmVariant (#390717) 2025-03-21 15:58:59 +00:00
Robert Hensing
9aab8b86c7 nixos: Cut off virtualisation.vmVariant.virtualisation.vmVariant
This produced an unnecessarily infinitely deep config tree.

The "cut off" option can be written to, but not read from.
Being written to is important, because it allows users to
conveniently define vmVariant config without having to check
isVmVariant.

There's a small chance that someone *reads* from vmVariant config
in their normal config, and for them it will not be possible
to evaluate with `nixos-rebuild build-vm` anymore.

If this is a problem, we could perhaps make the vmVariant root
appear instead of the `throw` error.
This could also be done using mkOption apply.
2025-03-20 22:30:12 +00:00
evplus
c3f61d1cbd nixos/incus ensure br_netfilter module is enabled 2025-03-19 22:56:07 +01:00
Sandro
86f44b004d
nixos/nixos-containers: user options take precedence over module ones (#388409) 2025-03-19 18:59:56 +01:00
WilliButz
41c7225648
podman: use serviceConfig.ExecStart instead of script (#390731) 2025-03-19 12:06:33 +01:00
Benedikt Ritter
ef2bde5a13
docker: use serviceConfig.ExecStart instead of script 2025-03-19 11:12:59 +01:00
Benedikt Ritter
ccdfb91b48
podman: use serviceConfig.ExecStart instead of script 2025-03-19 11:08:18 +01:00
Todd Brown
b5c9cecbcc
nixos/docker: add auto prune randomizedDelaySec and persistent options (#301547)
docker: add auto prune randomizedDelaySec and persistent options

Options mirror nix garbage collection
2025-03-16 10:56:31 +01:00
Bruce Toll
ae4750868c nixos/ec2-data fix host fingerprint output to console (regression)
PR #322282 introduced a regression that causes the previous display of
the ssh host key fingerprints to get directed to the journal rather than
the console (as intended). Thus, the console only logs an empty set of
fingerprints:

    -----BEGIN SSH HOST KEY FINGERPRINTS-----
    -----END SSH HOST KEY FINGERPRINTS-----

The fix is to reorder the bash statement that invokes ssh-keygen so
that the ssh-keygen output is directed to /dev/console.
2025-03-15 13:16:03 -04:00
Marie Ramlow
342c4f300b nixos/{renovate, libvirtd}: fix typo 2025-03-15 00:30:21 +05:30
Emma Miler
542a053b32 nixos/oci-containers: add autoRemoveOnStop option
Adds the autoRemoveOnStop option to allow stopped or killed containers to stay around after stop. Default behaviour remains the same.
2025-03-10 19:35:47 +01:00
Kevin Boulain
c2d4e8f4cb nixos/nixos-containers: user options take precedence over module ones
I think this is the norm in NixOS modules. This allows to start a
container with '--volatile=overlay --link-journal=host' in order to
persist logs across runs of a container running with a temporary root.
While '--ephemeral' omits '--link-journal=try-guest', it's not possible
to run an ephemeral container when linking the journal:
https://github.com/systemd/systemd/issues/1666
2025-03-09 11:08:56 +01:00
Maximilian Bosch
7d443d378b
nixos/oci-containers: support rootless containers & healthchecks
Closes #259770
Closes #207050

The motivation for the former is to not execute the container as root,
so you don't have to `sudo -i` to perform podman management tasks.

The idea behind healthchecks is to be able to keep the unit in the
activating state until the container is healthy, only then then unit is
marked as active.

The following changes were necessary:

* Move the ctr-id into `/run/${containerName}` to make podman can
  actually write to it since it's now in its RuntimeDirectory.

* Make `sdnotify` option configurable (`healthy` for healthchecks that
  must pass, default remains `conmon`).

* Set Delegate=yes for `sdnotify=healthy` to make sure a rootless
  container can actually talk to sd_notify[1].

* Add a warning that lingering must be enabled to have a `systemd --user`
  instance running which is required for the cgroup support to work
  properly.

* Added a testcase for rootless containers with both conmon and
  healthchecks.

[1] https://github.com/containers/podman/discussions/20573#discussioncomment-7612481
2025-02-27 11:08:33 +01:00
Sandro
c2fbe453e6
nixos/libvirtd: fix path in hooks.network desc (#372951) 2025-02-19 21:32:22 +01:00
Ramses
51e84098b5
nixos-container: avoid subshell when testing $PRIVATE_USERS (#383056) 2025-02-19 10:46:48 +01:00
Jean-Baptiste Giraudeau
57c96ff6ef
nixos-container: avoid subshell when testing $PRIVATE_USERS
So that the script is not rejected by https://www.shellcheck.net/wiki/SC2235
 under `systemd.enableStrictShellChecks = true;`
2025-02-18 09:41:55 +01:00
Sandro
86f9eeb816
nixos-container: add support for --private-users (#362210) 2025-02-18 00:09:56 +01:00
Adam C. Stephens
8780973144
incus.ui: 0.7 -> incus-0.14.6, rename to incus-ui-canonical (#382440) 2025-02-16 17:43:56 -05:00
Adam C. Stephens
ad53a8451f
incus-ui-canonical: rename from incus.ui 2025-02-16 17:33:03 -05:00
Christian Kögler
bbd8de2fdd
nixos-container: do not touch os-release if it is a symlink (#353366) 2025-02-16 07:43:34 +01:00