Unverified Commit 1ecbbb6e authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

Merge pull request #260595 from adamcstephens/lxc/squashfs 

lxc-container: add squashfs image support and release output
parents 5fb48709 c2ff509e

nixos/lib/make-squashfs.nix

+10 −3
Original line number Diff line number Diff line 
{ lib, stdenv, squashfsTools, closureInfo



,  fileName ? "squashfs"

, # The root directory of the squashfs filesystem is filled with the

  # closures of the Nix store paths listed here.

  storeContents ? []

  # Pseudo files to be added to squashfs image

, pseudoFiles ? []

, noStrip ? false

, # Compression parameters.

  # For zstd compression you can use "zstd -Xcompression-level 6".

  comp ? "xz -Xdict-size 100%"

}:



let

  pseudoFilesArgs = lib.concatMapStrings (f: ''-p "${f}" '') pseudoFiles;

in

stdenv.mkDerivation {

  name = "squashfs.img";

  name = "${fileName}.img";

  __structuredAttrs = true;



  nativeBuildInputs = [ squashfsTools ];
@@ -31,8 +38,8 @@ stdenv.mkDerivation { 
    '' + ''



      # Generate the squashfs image.

      mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \

        -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp} \

      mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out ${pseudoFilesArgs} \

        -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 -comp ${comp} \

        -processors $NIX_BUILD_CORES

    '';

}

nixos/modules/virtualisation/lxc-container.nix

+17 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ in { 
        ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system

      '';



    # TODO: build rootfs as squashfs for faster unpack

    system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {

      extraArgs = "--owner=0";
@@ -64,6 +63,23 @@ in { 
      extraCommands = "mkdir -p proc sys dev";

    };



    system.build.squashfs = pkgs.callPackage ../../lib/make-squashfs.nix {

      fileName = "nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}";



      noStrip = true; # keep directory structure

      comp = "zstd -Xcompression-level 6";



      storeContents = [config.system.build.toplevel];



      pseudoFiles = [

        "/sbin d 0755 0 0"

        "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init"

        "/dev d 0755 0 0"

        "/proc d 0555 0 0"

        "/sys d 0555 0 0"

      ];

    };



    system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" ''

      #!${pkgs.runtimeShell}

      ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init

nixos/release.nix

+15 −0
Original line number Diff line number Diff line
@@ -328,6 +328,21 @@ in rec { 


  );



  lxdContainerImageSquashfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:



    with import ./.. { inherit system; };



    hydraJob ((import lib/eval-config.nix {

      inherit system;

      modules =

        [ configuration

          versionModule

          ./maintainers/scripts/lxd/lxd-container-image.nix

        ];

    }).config.system.build.squashfs)



  );



  # Metadata for the lxd image

  lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:

nixos/tests/lxd/container.nix

+12 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ let 


  lxd-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

  lxd-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};

  lxd-image-rootfs-squashfs = releases.lxdContainerImageSquashfs.${pkgs.stdenv.hostPlatform.system};



in {

  name = "lxd-container";
@@ -23,7 +24,7 @@ in { 


  nodes.machine = { lib, ... }: {

    virtualisation = {

      diskSize = 4096;

      diskSize = 6144;



      # Since we're testing `limits.cpu`, we've gotta have a known number of

      # cores to lean on
@@ -65,6 +66,16 @@ in { 
        machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

        machine.succeed("lxc delete -f container")



    with subtest("Squashfs image is functional"):

        machine.succeed(

            "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs-squashfs} --alias nixos-squashfs"

        )

        machine.succeed("lxc launch nixos-squashfs container")

        with machine.nested("Waiting for instance to start and be usable"):

          retry(instance_is_up)

        machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

        machine.succeed("lxc delete -f container")



    with subtest("Container is mounted with lxcfs inside"):

        machine.succeed("lxc launch nixos container")

        with machine.nested("Waiting for instance to start and be usable"):