From 2bb57ef7761fc9d408bb27b2733d36c8640e0e4b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 4 Sep 2017 19:02:05 -0400 Subject: docker: Allow package selection in module --- nixos/modules/virtualisation/docker.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 5a8a0e27436f1..a9a2095499a73 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -126,14 +126,23 @@ in ''; }; }; + + package = mkOption { + default = pkgs.docker; + type = types.package; + example = pkgs.docker-edge; + description = '' + Docker package to be used in the module. + ''; + }; }; ###### implementation config = mkIf cfg.enable (mkMerge [{ - environment.systemPackages = [ pkgs.docker ]; + environment.systemPackages = [ cfg.package ]; users.extraGroups.docker.gid = config.ids.gids.docker; - systemd.packages = [ pkgs.docker ]; + systemd.packages = [ cfg.package ]; systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; @@ -142,7 +151,7 @@ in ExecStart = [ "" '' - ${pkgs.docker}/bin/dockerd \ + ${cfg.package}/bin/dockerd \ --group=docker \ --host=fd:// \ --log-driver=${cfg.logDriver} \ @@ -180,7 +189,7 @@ in serviceConfig.Type = "oneshot"; script = '' - ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags} + ${cfg.package}/bin/docker system prune -f ${toString cfg.autoPrune.flags} ''; startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates; -- cgit 1.4.1