zowoq
2689dfaa08
nixos/cri-o: default to upstream pause
2020-05-25 12:27:49 +02:00
zowoq
eeff166faa
nixos/cri-o: add runtime option
2020-05-25 12:27:49 +02:00
zowoq
9e7fbc6f2c
nixos/cri-o, cri-o: add wrapper
2020-05-25 12:27:49 +02:00
Sascha Grunert
6653328aef
cri-o: update module configuration
...
- Update the default pause image
- Set the cgroup manager to systemd
- Enable `manage_ns_lifecycle` instead of the deprecated
`manage_network_ns_lifecycle` option
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-05-25 02:24:57 +02:00
Evan Stoll
2f943ebc25
virtualisation: add vmware-image ( #88523 )
2020-05-22 10:03:46 +02:00
Florian Klink
45c03c0dd2
nixos/azure-agent: always run systemctl of the currently running systemd
2020-05-21 10:34:11 +02:00
Evan Stoll
ef80f345be
virtualisation/hyperv-image: remove diskImage after vhdx is generated
2020-05-20 19:56:38 -04:00
zowoq
5195aed617
rkt: remove
2020-05-16 09:23:07 +10:00
Jaka Hudoklin
056ab3d278
nixos/libvirtd: use polkit for auth
2020-05-13 21:00:04 +07:00
Vladimír Čunát
54eb2d1018
Merge branch 'staging-next'
...
Status on Hydra for linuxes seems good enough:
https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
2020-05-06 08:20:05 +02:00
Daniel Fullmer
37676e77cb
nixos/systemd-boot: Add basic test
2020-05-05 14:18:18 -04:00
Frederik Rietdijk
9875bbae75
Merge master into staging-next
2020-05-05 19:51:09 +02:00
zowoq
a677738a23
podman: use $out instead of $bin with buildGoPackage
2020-05-04 20:55:21 +01:00
adisbladis
b1ae5f864a
Merge pull request #86634 from zowoq/crio-upstream-config
...
nixos/cri-o: copy upstream config
2020-05-04 15:22:49 +02:00
adisbladis
2f7747526c
nixos/docker-containers: Rename to virtualisation.oci-containers.containers.
...
And allow the runtime to be configurable via the
`virtualisation.oci-containers.backend` option.
Valid choices are "podman" and "docker".
2020-05-04 13:47:25 +01:00
Jörg Thalheim
320f79365d
Merge pull request #86445 from zowoq/podman-staging
2020-05-04 08:07:37 +01:00
zowoq
a44b3b6afc
nixos/cri-o: copy upstream config
2020-05-03 17:17:05 +10:00
Frederik Rietdijk
afb1041148
Merge master into staging-next
2020-05-02 09:39:00 +02:00
Florian Klink
0a98d10850
Merge pull request #82026 from andir/systemd-update-networkd-options
...
nixos/networkd: update configuration options
2020-05-01 13:49:24 +02:00
Andreas Rammhold
819e8bb35f
nixos/networkd: rename the networkd dhcpConfig option to dhcpV4Config
...
This follows upstreams change in documentation. While the `[DHCP]`
section might still work it is undocumented and we should probably not
be using it anymore. Users can just upgrade to the new option without
much hassle.
I had to create a bit of custom module deprecation code since the usual
approach doesn't support wildcards in the path.
2020-05-01 13:33:54 +02:00
zowoq
b815de00f7
podman: use $out instead of $bin with buildGoPackage
2020-05-01 18:24:09 +10:00
Frederik Rietdijk
484ee79050
Merge staging-next into staging
2020-05-01 08:57:10 +02:00
adisbladis
1a70e4ffa6
Merge pull request #86097 from zowoq/docker
...
nixos/podman: add assertion for dockerCompat
2020-04-30 19:26:05 +02:00
adisbladis
78cba5ac1e
nixos.podman: Expose extraPackages from the podman wrapper
2020-04-29 11:53:06 +01:00
adisbladis
b2a9a3e9cb
podman: Wrap packages required to run containers
2020-04-29 11:40:44 +01:00
zowoq
c59c4e3589
nixos/*: use $out instead of $bin with buildGoPackage
2020-04-28 20:30:29 +10:00
worldofpeace
a7ca287ecb
nixos/qemu-vm: don't set -vga std
...
This has been default since QEMU 2.2, it also prevents using a different
-vga
2020-04-27 20:04:03 +02:00
Jörg Thalheim
e92b11d964
Merge pull request #86104 from xaverdh/options-types
2020-04-27 11:03:43 +01:00
Dominik Xaver Hörl
c10d82358f
treewide: add types to boolean / enable options or make use of mkEnableOption
2020-04-27 09:32:01 +02:00
zowoq
3c83386c6b
nixos/podman: add assertion for dockerCompat
2020-04-27 14:08:19 +10:00
AmineChikhaoui
9cf9e66e6f
ec2-amis.nix: add NixOS 20.03 images
...
Fixes #85857 .
2020-04-26 09:54:10 -04:00
Graham Christensen
a2e9965d74
Merge pull request #82414 from AmineChikhaoui/update-ec2-amis-19-09
...
ec2 amis: update 19.09 AMIs
2020-04-25 18:15:41 -04:00
zowoq
b464d76126
nixos/cri-o: share registries with nixos/containers
2020-04-24 20:53:36 +10:00
adisbladis
5a3b818368
Merge pull request #85894 from zowoq/podman-crio
...
podman team: add cri-o packages/module
2020-04-24 11:34:07 +02:00
zowoq
0944d77fc0
nixos/containers: move libpod to nixos/podman
2020-04-24 15:34:05 +10:00
zowoq
4484e7981e
nixos/cri-o: update maintainers
2020-04-24 08:08:27 +10:00
zowoq
4102db2127
nixos/podman: remove cni-plugins from environment.systemPackages
2020-04-23 10:29:17 +10:00
zowoq
54b59dd6c0
nixos/cri-o: remove cni-plugins from environment.systemPackages
2020-04-23 10:29:11 +10:00
Piotr Bogdan
830733db24
nixos/manual: fix build
2020-04-22 16:56:44 +01:00
Ingo Blechschmidt
2e2da182fe
nixos-containers: add docs about nested containers
2020-04-22 05:30:48 +02:00
adisbladis
43f383c464
nixos.virtualisation.containers: Init common /etc/containers configuration module
...
What's happening now is that both cri-o and podman are creating
/etc/containers/policy.json.
By splitting out the creation of configuration files we can make the
podman module leaner & compose better with other container software.
2020-04-21 10:38:39 +01:00
adisbladis
650df709fb
nixos.virtualisation: Move containers.nix to nixos-containers.nix
...
In anticipation of the new containers module.
2020-04-21 10:36:56 +01:00
adisbladis
f0a92ef1d9
nixos/podman: Add maintainer team & add myself to podman team
2020-04-21 10:03:22 +01:00
adisbladis
b512a788a4
nixos/virtualisation.podman: Init module
2020-04-21 10:03:18 +01:00
adisbladis
ab37d7e7ea
nixos-containers: Add support for custom nixpkgs argument
2020-04-20 07:33:46 +01:00
Jaka Hudoklin
de6891ffd0
Merge pull request #83930 from xtruder/nixos/virtualisation/hyperv-image
...
modules/virtualisation: add hyperv-image
2020-04-14 03:27:22 +00:00
Silvan Mosberger
1d0fc9729d
nixos/treewide: Fix incorrectly rendered examples
...
Many options define their example to be a Nix value without using
literalExample. This sometimes gets rendered incorrectly in the manual,
causing confusion like in https://github.com/NixOS/nixpkgs/issues/25516
This fixes it by using literalExample for such options. The list of
option to fix was determined with this expression:
let
nixos = import ./nixos { configuration = {}; };
lib = import ./lib;
valid = d: {
# escapeNixIdentifier from https://github.com/NixOS/nixpkgs/pull/82461
set = lib.all (n: lib.strings.escapeNixIdentifier n == n) (lib.attrNames d) && lib.all (v: valid v) (lib.attrValues d);
list = lib.all (v: valid v) d;
}.${builtins.typeOf d} or true;
optionList = lib.optionAttrSetToDocList nixos.options;
in map (opt: {
file = lib.elemAt opt.declarations 0;
loc = lib.options.showOption opt.loc;
}) (lib.filter (opt: if opt ? example then ! valid opt.example else false) optionList)
which when evaluated will output all options that use a Nix identifier
that would need escaping as an attribute name.
2020-04-02 07:49:25 +02:00
Jaka Hudoklin
54b04af86e
modules/virtualisation: add hyperv-image
...
This module implements builder for hyper-v images.
2020-04-01 13:26:51 +07:00
Robin Gloster
d6fa642608
Merge pull request #81161 from wedens/libvirt-6.0.0
...
libvirt: 5.4.0 -> 6.1.0
2020-03-30 13:19:00 +00:00
Robin Gloster
b80edca6be
libvirt: fix escapeShellArg usage
...
Co-Authored-By: conferno <conferno@camfex.cz>
2020-03-30 09:45:28 +00:00
