Fixes for CI

[?]
Mar 24, 2023, 10:28 AM
ZSVCCJBXFX7BJ4EY4VE742ZTAJZZWUXYZHR2TGUHF4HGK6II2U3AC

Dependencies

Change contents

  • replacement in 05-static-container/podman-setup-script.nix at line 1
    [3.843][3.844:2071]()
    { pkgs }:
    let
    registriesConf = pkgs.writeText "registries.conf" ''
    [registries.search]
    registries = ['docker.io']
    [registries.block]
    registries = []
    '';
    storageConf = pkgs.writeText "storage.conf" ''
    [storage]
    driver = "overlay"
    # rootless_storage_path="$XDG_DATA_HOME/containers/storage"
    '';
    in pkgs.writeShellScript "podman-setup" ''
    # Dont overwrite customised configuration
    if ! test -f ~/.config/containers/policy.json; then
    echo "Installing missing ~/.config/containers/policy.json"
    install -Dm644 ${pkgs.skopeo.src}/default-policy.json ~/.config/containers/policy.json
    fi
    if ! test -f ~/.config/containers/registries.conf; then
    echo "Installing missing ~/.config/containers/registries.conf"
    install -Dm644 ${registriesConf} ~/.config/containers/registries.conf
    fi
    if ! test -f ~/.config/containers/storage.conf; then
    echo "Installing missing ~/.config/containers/storage.conf"
    install -Dm644 ${storageConf} ~/.config/containers/storage.conf
    fi
    if ! grep -q "^''${USER}:" /etc/subuid; then
    echo "No subuid range defined for user, consider running 'sudo usermod --add-subuids 10000-75535 ''${USER}' to allow rootless podman to work"
    fi
    ''
    [3.843]
    ../03-nix-container/podman-setup-script.nix
  • replacement in 03-nix-container/podman-setup-script.nix at line 17
    [3.1173][3.1173:1236]()
    echo "Installing missing ~/.config/containers/policy.json"
    [3.1173]
    [3.1236]
    >&2 echo "Installing missing ~/.config/containers/policy.json"
  • replacement in 03-nix-container/podman-setup-script.nix at line 21
    [3.1390][3.1390:1457]()
    echo "Installing missing ~/.config/containers/registries.conf"
    [3.1390]
    [3.1457]
    >&2 echo "Installing missing ~/.config/containers/registries.conf"
  • replacement in 03-nix-container/podman-setup-script.nix at line 25
    [3.1591][3.1591:1655]()
    echo "Installing missing ~/.config/containers/storage.conf"
    [3.1591]
    [3.1655]
    >&2 echo "Installing missing ~/.config/containers/storage.conf"
  • replacement in 03-nix-container/podman-setup-script.nix at line 30
    [3.65][3.65:211]()
    echo "No subuid range defined for user, consider running 'sudo usermod --add-subuids 10000-75535 ''${USER}' to allow rootless podman to work"
    [3.65]
    [3.1723]
    >&2 echo "No subuid range defined for user, consider running 'sudo usermod --add-subuids 10000-75535 ''${USER}' to allow rootless podman to work"
  • replacement in .gitlab-ci.yml at line 14
    [2.3074][2.3074:3146]()
    - rm -f /nix/var/nix/gcroots/per-user/${USER}/nix-container-demo-*
    [2.3074]
    [2.3146]
    - rm -f /nix/var/nix/gcroots/per-user/${USER}/nix-container-demo-*
  • replacement in .gitlab-ci.yml at line 16
    [2.3201][2.3201:3275]()
    - ls -1dtr /nix/var/nix/gcroots/per-user/${USER}/nix-container-demo-*
    [2.3201]
    [3.151]
    - for f in $(ls -1dtr /nix/var/nix/gcroots/per-user/${USER}/nix-container-demo-*); do basename $f; done