From 3d932212881c7d953659180af32e98645fb9e5c3 Mon Sep 17 00:00:00 2001 From: Lasath Fernando Date: Sat, 7 Dec 2024 02:23:01 +0000 Subject: [PATCH] Re-add docker There are just too many bugs to deal with in podman, whereas docker just works. https://invent.kde.org/-/snippets/3274 https://github.com/89luca89/distrobox/issues/1624 https://github.com/89luca89/distrobox/issues/1401 and a ton more every time I try to do something. This also gives docker permissions to the `wheel` group (instead of having to add users to a newly-created `docker` group). Since everyone in `wheel` are already root-equivalent, this makes more sense anyway. --- mkosi.conf.d/99-packages-development.conf | 4 +++- mkosi.extra/etc/docker/daemon.json | 3 +++ mkosi.extra/etc/docker/daemon.json.license | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mkosi.extra/etc/docker/daemon.json create mode 100644 mkosi.extra/etc/docker/daemon.json.license diff --git a/mkosi.conf.d/99-packages-development.conf b/mkosi.conf.d/99-packages-development.conf index d3918c4..47d99ab 100644 --- a/mkosi.conf.d/99-packages-development.conf +++ b/mkosi.conf.d/99-packages-development.conf @@ -8,6 +8,9 @@ Packages=base-devel clazy cmake distrobox + docker + docker-buildx + docker-compose edk2-ovmf flatpak-builder gammaray @@ -18,7 +21,6 @@ Packages=base-devel perf podman podman-compose - podman-docker qemu-desktop tree vim diff --git a/mkosi.extra/etc/docker/daemon.json b/mkosi.extra/etc/docker/daemon.json new file mode 100644 index 0000000..84ba83d --- /dev/null +++ b/mkosi.extra/etc/docker/daemon.json @@ -0,0 +1,3 @@ +{ + "group": "wheel", +} diff --git a/mkosi.extra/etc/docker/daemon.json.license b/mkosi.extra/etc/docker/daemon.json.license new file mode 100644 index 0000000..6e34bf6 --- /dev/null +++ b/mkosi.extra/etc/docker/daemon.json.license @@ -0,0 +1,2 @@ +SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: 2024 Lasath Fernando