[PATCH] rde: docker: Add containerd-service-type

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[PATCH] rde: docker: Add containerd-service-type

Jonathan Pieper <jpieper@mailbox.org>

Details

Message ID: <20240821100936.16880-1-jpieper@mailbox.org>
DKIM signature: pass

Download raw message

3 months ago

Patch: +5 -2

---
Hi Andrew,

The recent docker-service-type requires to add containerd-service-type to the system configuration [0].
Here's a fix.

Best,
Jonathan

 src/rde/features/docker.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rde/features/docker.scm b/src/rde/features/docker.scm
index 9ecf1268..a898e150 100644
--- a/src/rde/features/docker.scm
+++ b/src/rde/features/docker.scm
@@ -63,12 +63,15 @@ Keybinding and Dockerfile major mode association."
       'docker-add-docker-group-to-user
       rde-account-service-type
       (list "docker"))
+     (service
+      containerd-service-type
+      (containerd-configuration
+       (containerd containerd)))
      (service
       docker-service-type
       (docker-configuration
        (docker docker)
-       (docker-cli docker-cli)
-       (containerd containerd)))))
+       (docker-cli docker-cli)))))
 
   (feature
    (name f-name)
-- 
2.45.1

Andrew Tropin <andrew@trop.in>

Details

Message ID: <87a5h6hrlz.fsf@trop.in>
In-Reply-To: <20240821100936.16880-1-jpieper@mailbox.org> (view parent)
DKIM signature: pass

Download raw message

3 months ago

On 2024-08-21 12:04, Jonathan Pieper wrote:

> ---
> Hi Andrew,
>
> The recent docker-service-type requires to add containerd-service-type to the system configuration [0].
> Here's a fix.
>
> Best,
> Jonathan
>
>  src/rde/features/docker.scm | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/rde/features/docker.scm b/src/rde/features/docker.scm
> index 9ecf1268..a898e150 100644
> --- a/src/rde/features/docker.scm
> +++ b/src/rde/features/docker.scm
> @@ -63,12 +63,15 @@ Keybinding and Dockerfile major mode association."
>        'docker-add-docker-group-to-user
>        rde-account-service-type
>        (list "docker"))
> +     (service
> +      containerd-service-type
> +      (containerd-configuration
> +       (containerd containerd)))
>       (service
>        docker-service-type
>        (docker-configuration
>         (docker docker)
> -       (docker-cli docker-cli)
> -       (containerd containerd)))))
> +       (docker-cli docker-cli)))))
>  
>    (feature
>     (name f-name)

Thank you very much for the fix!  Applied, pushed as
https://git.sr.ht/~abcdw/rde/commit/38a83d33

-- 
Best regards,
Andrew Tropin

~abcdw/rde-devel

[PATCH] rde: docker: Add containerd-service-type