commit c23032a8b11d0585c1f1aece1d2b0abd82148e82 · pyrox.dev/nixpkgs

+1 -2

nixos/modules/services/web-servers/lighttpd/inginious.nix

···

       191
       191
        
               virtualisation.docker = {

     

       192
       192
        
                 enable = true;

     

       193
       193
        
                 # We need docker to listen on port 2375.

     

       194
       194
       -
                 extraOptions = "-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock";

     

       194
       194
       +
                 listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"];

     

       195
       195
        
                 storageDriver = mkDefault "overlay";

     

       196
       196
       -
                 socketActivation = false;

     

       197
       196
        
               };

     

       198
       197
        
       

     

       199
       198
        
               users.extraUsers."lighttpd".extraGroups = [ "docker" ];

+55 -38

nixos/modules/virtualisation/docker.nix

···

       28
       28
        
                   <command>docker</command> command line tool.

     

       29
       29
        
                 '';

     

       30
       30
        
             };

     

       31
       31
       -
           socketActivation =

     

       31
       31
       +
       

     

       32
       32
       +
           listenOptions =

     

       33
       33
       +
             mkOption {

     

       34
       34
       +
               type = types.listOf types.str;

     

       35
       35
       +
               default = ["/var/run/docker.sock"];

     

       36
       36
       +
               description =

     

       37
       37
       +
                 ''

     

       38
       38
       +
                   A list of unix and tcp docker should listen to. The format follows

     

       39
       39
       +
                   ListenStream as described in systemd.socket(5).

     

       40
       40
       +
                 '';

     

       41
       41
       +
             };

     

       42
       42
       +
       

     

       43
       43
       +
           enableOnBoot =

     

       44
       44
       +
             mkOption {

     

       45
       45
       +
               type = types.bool;

     

       46
       46
       +
               default = true;

     

       47
       47
       +
               description =

     

       48
       48
       +
                 ''

     

       49
       49
       +
                   When enabled dockerd is started on boot. This is required for

     

       50
       50
       +
                   container, which are created with the

     

       51
       51
       +
                   <literal>--restart=always</literal> flag, to work. If this option is

     

       52
       52
       +
                   disabled, docker might be started on demand by socket activation.

     

       53
       53
       +
                 '';

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
           liveRestore =

     

       32
       57
        
             mkOption {

     

       33
       58
        
               type = types.bool;

     

       34
       59
        
               default = true;

     

       35
       60
        
               description =

     

       36
       61
        
                 ''

     

       37
       37
       -
                   This option enables docker with socket activation. I.e. docker will

     

       38
       38
       -
                   start when first called by client.

     

       62
       62
       +
                   Allow dockerd to be restarted without affecting running container.

     

       63
       63
       +
                   This option is incompatible with docker swarm.

     

       39
       64
        
                 '';

     

       40
       65
        
             };

     

       66
       66
       +
       

     

       41
       67
        
           storageDriver =

     

       42
       68
        
             mkOption {

     

       43
       69
        
               type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]);

     
···

       69
       95
        
                   <command>docker</command> daemon.

     

       70
       96
        
                 '';

     

       71
       97
        
             };

     

       72
       72
       -
       

     

       73
       73
       -
           postStart =

     

       74
       74
       -
             mkOption {

     

       75
       75
       -
               type = types.lines;

     

       76
       76
       -
               default = ''

     

       77
       77
       -
                 while ! [ -e /var/run/docker.sock ]; do

     

       78
       78
       -
                   sleep 0.1

     

       79
       79
       -
                 done

     

       80
       80
       -
               '';

     

       81
       81
       -
               description = ''

     

       82
       82
       -
                 The postStart phase of the systemd service. You may need to

     

       83
       83
       -
                 override this if you are passing in flags to docker which

     

       84
       84
       -
                 don't cause the socket file to be created. This option is ignored

     

       85
       85
       -
                 if socket activation is used.

     

       86
       86
       -
               '';

     

       87
       87
       -
             };

     

       88
       88
       -
       

     

       89
       89
       -
       

     

       90
       98
        
         };

     

       91
       99
        
       

     

       92
       100
        
         ###### implementation

     
···

       94
       102
        
         config = mkIf cfg.enable (mkMerge [

     

       95
       103
        
           { environment.systemPackages = [ pkgs.docker ];

     

       96
       104
        
             users.extraGroups.docker.gid = config.ids.gids.docker;

     

       105
       105
       +
             # this unit follows the one provided by upstream see: https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.service

     

       106
       106
       +
             # comments below reflect experience from upstream.

     

       97
       107
        
             systemd.services.docker = {

     

       98
       108
        
               description = "Docker Application Container Engine";

     

       99
       99
       -
               wantedBy = optional (!cfg.socketActivation) "multi-user.target";

     

       100
       100
       -
               after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ;

     

       101
       101
       -
               requires = optional cfg.socketActivation "docker.socket";

     

       109
       109
       +
               wantedBy = optional cfg.enableOnBoot "multi-user.target";

     

       110
       110
       +
               after = [ "network.target" "docker.socket" ];

     

       111
       111
       +
               requires = ["docker.socket"];

     

       102
       112
        
               serviceConfig = {

     

       113
       113
       +
                 # the default is not to use systemd for cgroups because the delegate issues still

     

       114
       114
       +
                 # exists and systemd currently does not support the cgroup feature set required

     

       115
       115
       +
                 # for containers run by docker

     

       103
       116
        
                 ExecStart = ''${pkgs.docker}/bin/dockerd \

     

       104
       104
       -
                   --group=docker --log-driver=${cfg.logDriver} \

     

       117
       117
       +
                   --group=docker \

     

       118
       118
       +
                   --host=fd:// \

     

       119
       119
       +
                   --log-driver=${cfg.logDriver} \

     

       105
       120
        
                   ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \

     

       106
       106
       -
                   ${optionalString cfg.socketActivation "--host=fd://"} \

     

       121
       121
       +
                   ${optionalString cfg.liveRestore "--live-restore" } \

     

       107
       122
        
                   ${cfg.extraOptions}

     

       108
       123
        
                 '';

     

       109
       109
       -
                 #  I'm not sure if that limits aren't too high, but it's what

     

       110
       110
       -
                 #  goes in config bundled with docker itself

     

       124
       124
       +
                 Type="notify";

     

       125
       125
       +
                 ExecReload="${pkgs.procps}/bin/kill -s HUP $MAINPID";

     

       111
       126
        
                 LimitNOFILE = 1048576;

     

       112
       112
       -
                 LimitNPROC = 1048576;

     

       127
       127
       +
                 # Having non-zero Limit*s causes performance problems due to accounting overhead

     

       128
       128
       +
                 # in the kernel. We recommend using cgroups to do container-local accounting.

     

       129
       129
       +
                 LimitNPROC="infinity";

     

       130
       130
       +
                 LimitCORE="infinity";

     

       131
       131
       +
                 TasksMax="infinity";

     

       132
       132
       +
                 TimeoutStartSec=0;

     

       133
       133
       +
                 # set delegate yes so that systemd does not reset the cgroups of docker containers

     

       134
       134
       +
                 Delegate="yes";

     

       135
       135
       +
                 # kill only the docker process, not all processes in the cgroup

     

       136
       136
       +
                 KillMode="process";

     

       113
       137
        
               } // proxy_env;

     

       114
       138
        
       

     

       115
       139
        
               path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);

     

       116
       116
       -
       

     

       117
       117
       -
               postStart = if cfg.socketActivation then "" else cfg.postStart;

     

       118
       118
       -
       

     

       119
       119
       -
               # Presumably some containers are running we don't want to interrupt

     

       120
       120
       -
               restartIfChanged = false;

     

       121
       140
        
             };

     

       122
       122
       -
           }

     

       123
       123
       -
           (mkIf cfg.socketActivation {

     

       124
       141
        
             systemd.sockets.docker = {

     

       125
       142
        
               description = "Docker Socket for the API";

     

       126
       143
        
               wantedBy = [ "sockets.target" ];

     

       127
       144
        
               socketConfig = {

     

       128
       128
       -
                 ListenStream = "/var/run/docker.sock";

     

       145
       145
       +
                 ListenStream = cfg.listenOptions;

     

       129
       146
        
                 SocketMode = "0660";

     

       130
       147
        
                 SocketUser = "root";

     

       131
       148
        
                 SocketGroup = "docker";

     

       132
       149
        
               };

     

       133
       150
        
             };

     

       134
       134
       -
           })

     

       151
       151
       +
           }

     

       135
       152
        
         ]);

     

       136
       153
        
       

     

       137
       154
        
       }

-2

nixos/tests/docker-registry.nix

···

       16
       16
        
       

     

       17
       17
        
           client1 = { config, pkgs, ...}: {

     

       18
       18
        
             virtualisation.docker.enable = true;

     

       19
       19
       -
             virtualisation.docker.socketActivation = false;

     

       20
       19
        
             virtualisation.docker.extraOptions = "--insecure-registry registry:8080";

     

       21
       20
        
           };

     

       22
       21
        
       

     

       23
       22
        
           client2 = { config, pkgs, ...}: {

     

       24
       23
        
             virtualisation.docker.enable = true;

     

       25
       25
       -
             virtualisation.docker.socketActivation = false;

     

       26
       24
        
             virtualisation.docker.extraOptions = "--insecure-registry registry:8080";

     

       27
       25
        
           };

     

       28
       26
        
         };