refactor: slimming a bit more and fixing docs

README.md

@@ -49,11 +49,10 @@ Suitable for running containerized workloads on either bare metal or virtual mac
 
 - Starts with a [Fedora CoreOS image](https://quay.io/repository/fedora/fedora-coreos?tab=tags)
 - Adds the following:
-  - [cockpit](https://cockpit-project.org) (podman and system management)
-  - [distrobox](https://github.com/89luca89/distrobox)
+  - [cockpit](https://cockpit-project.org) (podman container and system management)
   - [firewalld](https://firewalld.org/)
   - guest VM agents (`qemu-guest-agent` and `open-vm-tools`))
-  - moby-engine(docker), docker-compose and podman-compose
+  - [docker-compose](https://github.com/docker/compose) and [podman-compose](https://github.com/containers/podman-compose) (podman and moby-engine(docker) come by default with CoreOS)
   - [tailscale](https://tailscale.com) and [wireguard-tools](https://www.wireguard.com)
   - [tmux](https://github.com/tmux/tmux/wiki/Getting-Started)
   - udev rules enabling full functionality on some [Realtek 2.5Gbit USB Ethernet](https://github.com/wget/realtek-r8152-linux/) devices
@@ -67,7 +66,7 @@ Suitable for running containerized workloads on either bare metal or virtual mac
 - Disables Zincati auto upgrade/reboot service
 - Enables staging of automatic system updates via rpm-ostreed
 - Enables password based SSH auth (required for locally running cockpit web interface)
-- Provides public key to enable [SecureBoot](#secureboot) if using `nvidia` or `zfs` drivers
+- Provides public key allowing [SecureBoot](#secureboot) (for ucore signed `nvidia` or `zfs` drivers)
 
 Note: per [cockpit instructions](https://cockpit-project.org/running.html#coreos) the cockpit-ws RPM is **not** installed, rather it is provided as a pre-defined systemd service which runs a podman container.
 
@@ -77,7 +76,8 @@ This image builds on `ucore-minimal` but adds drivers, storage tools and utiliti
 
 - Starts with a [`ucore-minimal`](#ucore-minimal) image providing everything above, plus:
 - Adds the following:
-  - [cockpit-storaged](https://cockpit-project.org): Cockpit GUI for managing storage
+  - [cockpit-storaged](https://cockpit-project.org) (udisks2 based storage management)
+  - [distrobox](https://github.com/89luca89/distrobox) - a [toolbox](https://containertoolbx.org/) alternative
   - [duperemove](https://github.com/markfasheh/duperemove)
   - intel wifi firmware - CoreOS omits this despite including atheros wifi firmware... hardware enablement FTW
   - [mergerfs](https://github.com/trapexit/mergerfs)

ucore/Containerfile

@@ -20,8 +20,7 @@ COPY packages.json /tmp/packages.json
 
 COPY usr /usr
 
-RUN export IMAGE_NAME=ucore-minimal \
-    && mkdir -p /var/lib/alternatives \
+RUN mkdir -p /var/lib/alternatives \
     && /tmp/install-ucore-minimal.sh \
     && /tmp/post-install-ucore-minimal.sh \
     && mv /var/lib/alternatives /staged-alternatives \
@@ -44,8 +43,7 @@ COPY packages.json /tmp/packages.json
 
 COPY usr /usr
 
-RUN export IMAGE_NAME=ucore \
-    && mkdir -p /var/lib/alternatives \
+RUN mkdir -p /var/lib/alternatives \
     && /tmp/install-ucore.sh \
     && mv /var/lib/alternatives /staged-alternatives \
     && rm -fr /tmp/* /var/* \
@@ -65,8 +63,7 @@ ARG ZFS_TAG="${ZFS_TAG}"
 COPY *.sh /tmp/
 COPY packages.json /tmp/packages.json
 
-RUN export IMAGE_NAME=ucore-hci \
-    && mkdir -p /var/lib/alternatives \
+RUN mkdir -p /var/lib/alternatives \
     && /tmp/install-ucore-hci.sh \
     && mv /var/lib/alternatives /staged-alternatives \
     && rm -fr /tmp/* /var/* \

ucore/install-ucore-hci.sh

@@ -3,4 +3,5 @@
 set -ouex pipefail
 
 # install packages.json stuffs
+export IMAGE_NAME=ucore-hci
 /tmp/packages.sh

ucore/install-ucore-minimal.sh

@@ -59,4 +59,5 @@ fi
 curl -L https://pkgs.tailscale.com/stable/fedora/tailscale.repo -o /etc/yum.repos.d/tailscale.repo
 
 # install packages.json stuffs
+export IMAGE_NAME=ucore-minimal
 /tmp/packages.sh

ucore/install-ucore.sh

@@ -3,6 +3,7 @@
 set -ouex pipefail
 
 # install packages.json stuffs
+export IMAGE_NAME=ucore
 /tmp/packages.sh
 
 # install packages direct from github

ucore/packages.json

@@ -7,7 +7,6 @@
                 "cockpit-podman",
                 "cockpit-selinux",
                 "cockpit-system",
-                "distrobox",
                 "firewalld",
                 "open-vm-tools",
                 "podman",
@@ -16,17 +15,18 @@
                 "tailscale",
                 "tmux",
                 "wget",
-                "wireguard-tools",
-                "xdg-dbus-proxy",
-                "xdg-user-dirs"
+                "wireguard-tools"
             ],
             "ucore": [
                 "cockpit-storaged",
+                "distrobox",
                 "duperemove",
                 "iwlegacy-firmware",
                 "iwlwifi-dvm-firmware",
                 "iwlwifi-mvm-firmware",
-                "snapraid"
+                "snapraid",
+                "xdg-dbus-proxy",
+                "xdg-user-dirs"
             ],
             "ucore-hci": [
                 "cockpit-machines",