Maximilian Bosch
9cab80ce4d
Merge pull request #122203 from mohe2015/imperative-nixos-container-timeout
...
nixos-containers: Increase startup timeout for imperative containers
2021-05-22 23:04:12 +02:00
Jörg Thalheim
5b4915fb7a
Merge pull request #110927 from Izorkin/fix-qemu-ga
...
nixos/qemu-guest-agent: fix start service
2021-05-19 05:42:06 +01:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Johan Thomsen
7e310dd8e8
nixos/containerd: StartLimit* options must be in the unit-section
...
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
2021-05-17 06:17:18 +10:00
Johan Thomsen
2142f88526
nixos/containerd: sanitize StateDirectory and RuntimeDirectory
2021-05-17 06:17:18 +10:00
github-actions[bot]
39e3f7c2cc
Merge master into staging-next
2021-05-13 18:32:50 +00:00
Luke Granger-Brown
ca6255bf0b
nixos/docker: fix evaluation when NAT is enabled too
...
Both networking.nat.enable and virtualisation.docker.enable now want to
make sure that the IP forwarding sysctl is enabled, but the module
system dislikes that both modules contain this option.
Realistically this should be refactored a bit, so that the Docker module
automatically enables the NAT module instead, but this is a more obvious
fix.
2021-05-13 10:26:45 +00:00
github-actions[bot]
bc1f4b790e
Merge master into staging-next
2021-05-09 12:23:16 +00:00
Hedtke, Moritz
7a80d281ed
nixos/containers: Increase startup timeout for imperative containers
...
Changed the startup timeout from 15 seconds to one minute as 15 seconds is really low.
Also it's currently not possible to change it without editing your system configuration.
2021-05-08 19:59:20 +02:00
Laurynas Alekna
9317570735
nixos/docker: ensure ipv4 forwarding is enabled
...
Fixes #118656
2021-05-08 18:58:24 +01:00
github-actions[bot]
77c79724e3
Merge staging-next into staging
2021-05-04 06:20:26 +00:00
Silvan Mosberger
37e2fbda39
Merge pull request #121449 from endgame/metadata-fetcher-umask
...
metadata fetchers: use umask instead of fetch-and-chmod
2021-05-04 03:39:38 +02:00
github-actions[bot]
5e177b16b1
Merge staging-next into staging
2021-05-03 18:25:49 +00:00
Luke Granger-Brown
a0da004326
Merge pull request #121376 from urbas/amazon-init-shell-script-support
...
nixos/amazon-init: add user-data shell script support
2021-05-03 16:01:26 +01:00
Jack Kelly
5ea55e4ed0
metadata fetchers: use umask instead of fetch-and-chmod
2021-05-02 08:28:59 +10:00
github-actions[bot]
ef6416a6ba
Merge staging-next into staging
2021-05-01 00:54:32 +00:00
Florian Klink
44a0debca7
Merge pull request #121021 from pennae/container-sigterm
...
nixos/nix-containers: use SIGTERM to stop containers
2021-04-30 21:35:16 +02:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
...
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
github-actions[bot]
01105a117a
Merge staging-next into staging
2021-04-29 06:21:55 +00:00
Peter Hoeg
ce93de4f62
nixos/hyperv: bail gracefully if device is missing
2021-04-29 09:37:17 +08:00
pennae
82931ea446
nixos/nix-containers: use SIGTERM to stop containers
...
systemd-nspawn can react to SIGTERM and send a shutdown signal to the container
init process. use that instead of going through dbus and machined to request
nspawn sending the signal, since during host shutdown machined or dbus may have
gone away by the point a container unit is stopped.
to solve the issue that a container that is still starting cannot be stopped
cleanly we must also handle this signal in containerInit/stage-2.
2021-04-28 14:07:35 +02:00
github-actions[bot]
e30742adc3
Merge staging-next into staging
2021-04-26 12:06:35 +00:00
Lassulus
ee04d772e4
Merge pull request #120489 from samueldr/fix/make-disk-image-auto-size
...
Fix make disk image automatic size
2021-04-26 10:34:15 +02:00
github-actions[bot]
1626c4772a
Merge staging-next into staging
2021-04-25 12:06:12 +00:00
Frederik Rietdijk
c648f7ee2a
Merge master into staging-next
2021-04-25 13:54:29 +02:00
Luke Granger-Brown
0cc25061b0
Merge pull request #114240 from sorki/containers/nested
...
nixos/nixos-containers: default boot.enableContainers to true
2021-04-25 11:37:01 +01:00
lassulus
5aa4273e4f
treewide: use auto diskSize for make-disk-image
...
(cherry picked from commit f3aa040bcb
2021-04-24 14:49:07 -04:00
Michael Raskin
d04f1c4314
Merge pull request #101071 from ju1m/apparmor
...
apparmor: try again to fix and improve
2021-04-24 11:24:26 +00:00
github-actions[bot]
d8d6ba0d2e
Merge master into staging-next
2021-04-24 06:05:30 +00:00
Luke Granger-Brown
4fb91cbafe
Revert "treewide: use auto diskSize for make-disk-image"
...
This reverts commit f3aa040bcb
2021-04-24 02:38:36 +00:00
Julien Moutinho
05d334cfe2
Revert "Revert "apparmor: fix and improve the service""
...
This reverts commit 420f89ceb2
2021-04-23 07:17:55 +02:00
github-actions[bot]
b95da5efb6
Merge master into staging-next
2021-04-22 18:14:27 +00:00
lassulus
f3aa040bcb
treewide: use auto diskSize for make-disk-image
2021-04-22 19:52:49 +02:00
github-actions[bot]
8248f4db36
Merge master into staging-next
2021-04-22 06:05:51 +00:00
Matej Urbas
db5b547b25
nixos/amazon-init: add user-data shell script support
2021-04-18 10:19:06 +01:00
Philipp Mildenberger
f5922de1d7
nixos/oci-containers: add support for environment files
2021-04-15 10:57:56 +02:00
Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
Jörg Thalheim
9af991a1b1
Merge pull request #117618 from Mic92/docker
...
nixos/docker: re-add network.target
2021-04-09 12:43:13 +01:00
Dmitry Kalinkin
219590673c
Merge branch 'staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/panel/default.nix
pkgs/os-specific/linux/kernel/generic.nix
pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
Luke Granger-Brown
1ce6b05ea1
nixos/libvirtd: add package option
...
At the moment, it's not possible to override the libvirtd package used
without supplying a nixpkgs overlay. Adding a package option makes
libvirtd more consistent and allows enabling e.g. ceph and iSCSI support
more easily.
2021-04-09 01:20:19 +02:00
Phillip Cloud
7c36ce8d3a
nixos/containers: move extraConfig to settings model
2021-04-07 16:08:18 -04:00
Jan Tojnar
70babe5bcf
Merge branch 'staging-next' into staging
2021-04-06 16:25:41 +02:00
Alyssa Ross
25208eeaba
linux: remove xen_dom0 feature entirely
...
Xen is now enabled unconditionally on kernels that support it, so the
xen_dom0 feature doesn't do anything. The isXen attribute will now
produce a deprecation warning and unconditionally return true.
Passing in a custom value for isXen is no longer supported.
2021-04-05 09:25:39 +00:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias
2021-04-04 01:43:46 +02:00
Izorkin
e65d8e4845
nixos/qemu-guest-agent: add statedir
2021-03-31 20:07:17 +03:00
Sandro
da7bf30372
nixos/containers: update example path to match defaults
2021-03-29 03:40:44 +02:00
Jörg Thalheim
0f4872b4c4
nixos/docker: re-add network.target
...
Currently if docker starts concurrently with
firewall.service/systemd-networkd it breaks both due to iptables/netlink
logs.
2021-03-25 22:06:54 +01:00
Domen Kožar
b992a92fa0
Merge pull request #117021 from AmineChikhaoui/gcp-cloud-images
...
add new Google Cloud image for the current release
2021-03-25 10:42:06 +01:00
zowoq
4b11122749
nixos/containers: add catatonit / init_path
...
https://github.com/containers/common/blob/master/docs/containers.conf.5.md
- Also drop unneeded true from ociSeccompBpfHook
2021-03-21 20:57:28 +01:00
AmineChikhaoui
606b49721f
add new Google Cloud image for the current release
...
update the create-gce.sh script with the ability to create public images
out of a GS object.
2021-03-21 14:04:09 -04:00
