feat: replace docker with podman, fix justfile for nixpkgs-review (#197)

This commit is contained in:
Ryan Yin
2025-06-29 10:32:32 +08:00
committed by GitHub
parent 85039dd975
commit 763167ce0d
5 changed files with 22 additions and 19 deletions
+5 -5
View File
@@ -392,17 +392,17 @@ list-systemd:
# Run nixpkgs-review for PR # Run nixpkgs-review for PR
[linux] [linux]
[group('nixpkgs')] [group('nixpkgs')]
review pr: pkg-review pr:
gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f post-result=true -f pr={{pr}} gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f x86_64-darwin=no -f post-result=true -f pr={{pr}}
# Run package tests for PR # Run package tests for PR
[linux] [linux]
[group('nixpkgs')] [group('nixpkgs')]
test pr pname: pkg-test pr pname:
gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f post-result=true -f pr={{pr}} -f extra-args="-p {{pname}}.passthru.tests" gh workflow run review.yml --repo ryan4yin/nixpkgs-review-gha -f x86_64-darwin=no -f post-result=true -f pr={{pr}} -f extra-args="-p {{pname}}.passthru.tests"
# View the summary of a workflow # View the summary of a workflow
[linux] [linux]
[group('nixpkgs')] [group('nixpkgs')]
summary: pkg-summary:
gh workflow view review.yml --repo ryan4yin/nixpkgs-review-gha gh workflow view review.yml --repo ryan4yin/nixpkgs-review-gha
+1 -1
View File
@@ -5,7 +5,7 @@
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
docker-compose podman-compose
dive # explore docker layers dive # explore docker layers
lazydocker # Docker terminal UI. lazydocker # Docker terminal UI.
skopeo # copy/sync images between registries and local storage skopeo # copy/sync images between registries and local storage
-3
View File
@@ -56,9 +56,6 @@ in {
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
# conflict with feature: containerd-snapshotter
# virtualisation.docker.storageDriver = "btrfs";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave # on your system were taken. Its perfectly fine and recommended to leave
+2 -2
View File
@@ -8,7 +8,7 @@
users.groups = { users.groups = {
"${myvars.username}" = {}; "${myvars.username}" = {};
docker = {}; podman = {};
wireshark = {}; wireshark = {};
# for android platform tools's udev rules # for android platform tools's udev rules
adbusers = {}; adbusers = {};
@@ -30,7 +30,7 @@
"users" "users"
"networkmanager" "networkmanager"
"wheel" "wheel"
"docker" "podman"
"wireshark" "wireshark"
"adbusers" "adbusers"
"libvirtd" "libvirtd"
+14 -8
View File
@@ -23,17 +23,23 @@
boot.kernelModules = ["vfio-pci"]; boot.kernelModules = ["vfio-pci"];
virtualisation = { virtualisation = {
docker = { docker.enable = false;
podman = {
enable = true; enable = true;
daemon.settings = { # Create a `docker` alias for podman, to use it as a drop-in replacement
# enables pulling using containerd, which supports restarting from a partial pull dockerCompat = true;
# https://docs.docker.com/storage/containerd/ # Required for containers under podman-compose to be able to talk to each other.
"features" = {"containerd-snapshotter" = true;}; defaultNetwork.settings.dns_enabled = true;
# Periodically prune Podman resources
autoPrune = {
enable = true;
dates = "weekly";
flags = ["--all"];
}; };
};
# start dockerd on boot. oci-containers = {
# This is required for containers which are created with the `--restart=always` flag to work. backend = "podman";
enableOnBoot = true;
}; };
# Usage: https://wiki.nixos.org/wiki/Waydroid # Usage: https://wiki.nixos.org/wiki/Waydroid