git.iko.soy/typeable/nixpkgs
on master help sign in
Remove docker-preloader module and test
commit8595a0d6b936a20e29a784f01fa01114017c55c6 authorAntoine Eiche <lewo@abesis.fr> dateSat 25 Jul 2020, 02:28 (6 years ago) parent46e31c7
4 files changed−164
nixos/modules/virtualisation/docker-preloader.nix−134 nixos/modules/virtualisation/qemu-vm.nix−1 nixos/tests/all-tests.nix−1 nixos/tests/docker-preloader.nix−28
nixos/modules/virtualisation/docker-preloader.nixdeleted−134
@@ -1,134 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−with builtins;
5−
6−let
7− cfg = config.virtualisation;
8−
9− sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName;
10− hash = drv: head (split "-" (baseNameOf drv.outPath));
11− # The label of an ext4 FS is limited to 16 bytes
12− labelFromImage = image: substring 0 16 (hash image);
13−
14− # The Docker image is loaded and some files from /var/lib/docker/
15− # are written into a qcow image.
16− preload = image: pkgs.vmTools.runInLinuxVM (
17− pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" {
18− buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ];
19− preVM = pkgs.vmTools.createEmptyImage {
20− size = cfg.dockerPreloader.qcowSize;
21− fullName = "docker-deamon-image.qcow2";
22− };
23− }
24− ''
25− mkfs.ext4 /dev/vda
26− e2label /dev/vda ${labelFromImage image}
27− mkdir -p /var/lib/docker
28− mount -t ext4 /dev/vda /var/lib/docker
29−
30− modprobe overlay
31−
32− # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
33− mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
34− cd /sys/fs/cgroup
35− for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
36− mkdir -p $sys
37− if ! mountpoint -q $sys; then
38− if ! mount -n -t cgroup -o $sys cgroup $sys; then
39− rmdir $sys || true
40− fi
41− fi
42− done
43−
44− dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
45−
46− until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
47− printf '.'
48− sleep 1
49− done
50−
51− docker load -i ${image}
52−
53− kill %1
54− find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf
55− '');
56−
57− preloadedImages = map preload cfg.dockerPreloader.images;
58−
59−in
60−
61−{
62− options.virtualisation.dockerPreloader = {
63− images = mkOption {
64− default = [ ];
65− type = types.listOf types.package;
66− description =
67− ''
68− A list of Docker images to preload (in the /var/lib/docker directory).
69− '';
70− };
71− qcowSize = mkOption {
72− default = 1024;
73− type = types.int;
74− description =
75− ''
76− The size (MB) of qcow files.
77− '';
78− };
79− };
80−
81− config = mkIf (cfg.dockerPreloader.images != []) {
82− assertions = [{
83− # If docker.storageDriver is null, Docker choose the storage
84− # driver. So, in this case, we cannot be sure overlay2 is used.
85− assertion = cfg.docker.storageDriver == "overlay2"
86− || cfg.docker.storageDriver == "overlay"
87− || cfg.docker.storageDriver == null;
88− message = "The Docker image Preloader only works with overlay2 storage driver!";
89− }];
90−
91− virtualisation.qemu.options =
92− map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2")
93− preloadedImages;
94−
95−
96− # All attached QCOW files are mounted and their contents are linked
97− # to /var/lib/docker/ in order to make image available.
98− systemd.services.docker-preloader = {
99− description = "Preloaded Docker images";
100− wantedBy = ["docker.service"];
101− after = ["network.target"];
102− path = with pkgs; [ mount rsync jq ];
103− script = ''
104− mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2
105− echo '{}' > /tmp/repositories.json
106−
107− for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do
108− mkdir -p /mnt/docker-images/$i
109−
110− # The ext4 label is limited to 16 bytes
111− mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i
112−
113− find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\
114− -exec ln -s '{}' /var/lib/docker/overlay2/ \;
115− cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/
116−
117− rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/
118−
119− # Accumulate image definitions
120− cp /tmp/repositories.json /tmp/repositories.json.tmp
121− jq -s '.[0] * .[1]' \
122− /tmp/repositories.json.tmp \
123− /mnt/docker-images/$i/image/overlay2/repositories.json \
124− > /tmp/repositories.json
125− done
126−
127− mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json
128− '';
129− serviceConfig = {
130− Type = "oneshot";
131− };
132− };
133− };
134−}
nixos/modules/virtualisation/qemu-vm.nix−1
@@ -264,7 +264,6 @@ in
264264{
265265 imports = [
266266 ../profiles/qemu-guest.nix
267− ./docker-preloader.nix
268267 ];
269268
270269 options = {
nixos/tests/all-tests.nix−1
@@ -79,7 +79,6 @@ in
7979 docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
8080 oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
8181 docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
82− docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {};
8382 docker-registry = handleTest ./docker-registry.nix {};
8483 docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
8584 docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
nixos/tests/docker-preloader.nixdeleted−28
@@ -1,28 +0,0 @@
1−import ./make-test-python.nix ({ pkgs, ...} : {
2− name = "docker-preloader";
3− meta = with pkgs.stdenv.lib.maintainers; {
4− maintainers = [ lewo ];
5− broken = true; # fails with "read-only file system" error
6− };
7−
8− nodes = {
9− docker =
10− { pkgs, ... }:
11− {
12− virtualisation.docker.enable = true;
13− virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ];
14−
15− services.openssh.enable = true;
16− services.openssh.permitRootLogin = "yes";
17− services.openssh.extraConfig = "PermitEmptyPasswords yes";
18− users.extraUsers.root.password = "";
19− };
20− };
21− testScript = ''
22− start_all()
23−
24− docker.wait_for_unit("sockets.target")
25− docker.succeed("docker run nix nix-store --version")
26− docker.succeed("docker run bash bash --version")
27− '';
28−})