From a2f5c9415c193d201775aa2b613ab8705150a982 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 26 May 2021 17:48:15 +0200 Subject: [PATCH] Update README for 21.05 --- docs/modules/ROOT/pages/index.adoc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 37eb06f..3ef02e0 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -39,6 +39,12 @@ Arion allows to compose containers with different granularity: * <> * <> +Full NixOS is supported on + * docker-compose + podman with docker socket (NixOS >= 21.05) + * docker-compose + docker, before cgroupsv2 (NixOS < 21.05) + +`podman-compose` support is currently WIP on a separate branch. + == Installation === Nix @@ -52,10 +58,17 @@ $ nix-env -iA arion -f https://github.com/hercules-ci/arion/tarball/master Add this module to your NixOS configuration: ```nix -{ ... }: { - environment.systemPackages = [ (import (builtins.fetchTarball https://github.com/hercules-ci/arion/tarball/master) {}).arion ]; - virtualisation.docker.enable = true; - users.extraUsers.myuser.extraGroups = ["docker"]; +{ pkgs, ... }: { + environment.systemPackages = [ + pkgs.arion + pkgs.docker # docker CLI will use podman socket + ]; + virtualisation.docker.enable = false; + virtualisation.podman.enable = true; + virtualisation.podman.dockerSocket.enable = true; + + # Use your username instead of `myuser` + users.extraUsers.myuser.extraGroups = ["podman"]; } ```