diff --git a/README.md b/README.md index cde4179..b2df99a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A GNOME 51 desktop built on freedesktop-sdk 26.08. The system image uses bootc, An x86-64-v3 CPU is required, including all AMD Ryzen CPUs and Intel Haswell Core processors or newer. See the [CPU requirements](docs/building.md#requirements) for model exceptions and VM setup. -The OS includes native Ghostty, Docker with Compose and Buildx, Podman, Distrobox, Tailscale, and QEMU/libvirt. Bazaar installs as a Flatpak after the first boot with an internet connection. +The OS includes native Ghostty, Podman with Compose support, Distrobox, Tailscale, and QEMU/libvirt. Bazaar installs as a Flatpak after the first boot with an internet connection. For development tools, [mise](https://mise.jdx.dev/getting-started.html) installs in your user account automatically after login with an internet connection. Open a new terminal once installation finishes. It updates independently through `mise self-update`; `mise upgrade` updates the tools it manages. diff --git a/docs/automation.md b/docs/automation.md index 1bf77ef..212176a 100644 --- a/docs/automation.md +++ b/docs/automation.md @@ -46,15 +46,15 @@ A system that skipped the step 1 image only trusts the old key. Move it to that ## Adding dependencies -Docker's Engine, CLI, Compose and Buildx update together through the official Docker image. Its BuildStream source uses this annotation: +Docker Compose updates through its official binary image. Its BuildStream source uses this annotation: ```yaml - # renovate: datasource=docker depName=docker.io/library/docker - track: -dind + # renovate: datasource=docker depName=docker.io/docker/compose-bin + track: v ref: sha256: ``` -Keep the full version and `-dind` suffix. Renovate updates the tag and digest together and preserves the architecture of the existing Linux amd64 manifest pin. BuildStream's Docker source expects a platform manifest rather than a multi-platform index. +Keep the `v` prefix of the release tag. Renovate updates the tag and digest together and preserves the architecture of the existing Linux amd64 manifest pin. BuildStream's Docker source expects a platform manifest rather than a multi-platform index. The shared BuildStream plugin junctions have their own release tags and commit pins, managed directly by Renovate. The Docker source carries a small compatibility patch shared with other OCI imports, covering HTTP content types, Zstd layers and `sha256:` refs. Review that patch when updating the plugin release. diff --git a/docs/building.md b/docs/building.md index d41864e..92ee703 100644 --- a/docs/building.md +++ b/docs/building.md @@ -84,7 +84,7 @@ The pinned BuildStream docker source needs `patches/buildstream-plugins/docker-o The import verifies kernel and EFI signatures against the certificate from that image, requires signed modules and checks the kernel's security capabilities/default LSMs. It fails rather than silently accepting an unsigned update. Lockdown and disabled kexec come from Dakota's recipes; local boot arguments enable Intel IOMMU and disable IOMMU passthrough. See [Secure Boot](secure-boot.md) for enrollment. -BuildStream extracts Docker Engine, CLI, Compose and Buildx from the official `docker.io/library/docker` `-dind` image, pinned to its Linux amd64 manifest digest. Only selected binaries enter the OS; Alpine files and container entrypoints are excluded. Docker uses embedded containerd, with its runtime helpers under `/usr/libexec/docker`. Only its service adds that directory to PATH, keeping Podman's runtime independent. The mise binary lives in each user's home directory and is not part of the image or Renovate's dependencies. +BuildStream extracts Docker Compose from the official `docker.io/docker/compose-bin` image, pinned to its Linux amd64 manifest digest. It is installed as `/usr/libexec/docker/cli-plugins/docker-compose`, one of the paths `podman compose` checks for a provider, so it is not on PATH. The mise binary lives in each user's home directory and is not part of the image or Renovate's dependencies. `mise-bootstrap.service` runs at user login and uses the official `https://mise.run` installer to install mise into `~/.local/bin/mise`. The installer selects the release and verifies its download. System accounts are excluded. An existing file at that path skips installation; failures retry every 15 minutes while the user manager is running. A successful installation is left alone on subsequent logins. Removing the binary makes it eligible for installation again; use `systemctl --user mask --now mise-bootstrap.service` to opt out first. @@ -104,12 +104,10 @@ These defaults do not replace saved user settings after a rebase. If needed, ena Ghostty is the preferred terminal, including Ctrl+Alt+T. The build installs its resources through Dakota's full Ghostty recipe. A local filter preserves that cached artifact and permits its bundled `terminfo/g/ghostty` entry to replace ncurses' copy. It repeats Ghostty's runtime dependencies because BuildStream filters do not inherit them; review that short list when updating Dakota. The local configuration adds terminal selection, GNOME defaults and an editable dconf shortcut. It imposes no prompt, font or shell framework. -Docker starts as a system service. Use `sudo docker` initially. Adding an account to the `docker` group is a separate local choice that grants control of the root daemon. Distrobox uses its upstream autodetection, which prefers the included Podman, and runs rootless by default for regular users. No image-level Distrobox configuration overrides that choice. Docker remains available independently with Compose and Buildx. +Podman is the only container engine. `podman compose` runs the bundled Docker Compose against Podman's API socket. The image enables `podman.socket` for every user so the API starts on demand, and Compose builds use its classic builder through Podman. Dev container tools that support Podman, such as Zed with `use_podman` enabled, use the same path. Distrobox uses its upstream autodetection, which selects Podman, and runs rootless by default for regular users. No image-level Distrobox configuration overrides that choice. Flatpak Builder has native `patch`, `strip`, `eu-strip` and `eu-elfcompress` available. Local recipes keep the binutils and elfutils binaries in the image because freedesktop-sdk classifies them as development files, which image composition excludes. -`patches/dakota/firewalld-iptables.patch` adds a patch to Dakota's GNOME patch queue that adds iptables to firewalld's build and runtime dependencies. This lets its configure step discover the real IPv4 and IPv6 command paths instead of recording `/bin/false`. Docker's default iptables backend needs these paths for firewalld's direct API, even though firewalld itself keeps its nftables backend. Remove the patch when upstream supplies the dependency. - `patches/dakota/initramfs-firmware.patch` adds a patch to Dakota's GNOME patch queue that puts firmware requested by built-in kernel drivers into the initramfs. Those drivers load before the root filesystem is mounted, but GNOME's initramfs generator only looked for `.xz` firmware while freedesktop-sdk ships `.zst` or uncompressed files. It also adds `wireless-regdb-bin` to the initramfs. Built-in cfg80211 reads `regulatory.db` once at boot and never retries, so without it Wi-Fi stayed on the restrictive world regulatory domain. Remove the patch when upstream fixes the lookup and dependency. Python's bundled certifi list is temporarily replaced with a link to the system list. freedesktop-sdk's `ca-certificates` has dropped the `emSign ECC Root CA - G3` and `Comodo AAA Services root` certificates after the eMudhra intermediate key compromise, but its certifi still trusts them. Remove the link once its certifi is 2026.10.19 or newer. @@ -155,7 +153,7 @@ See [VM notes](vm.md) for the local test disk and the [installer guide](installe - [Dakota](https://github.com/projectbluefin/dakota) - [GNOME build metadata](https://gitlab.gnome.org/GNOME/gnome-build-meta) -- [Official Docker image recipe](https://github.com/docker-library/docker) +- [Docker Compose](https://github.com/docker/compose) - [mise installation](https://mise.jdx.dev/installing-mise.html) The image assembly follows the Dakota recipes, and the GNOME recipes Dakota selects, at the pinned revision. The shared plugin junctions follow upstream release tags, independently of Dakota. Upstream components retain their own licenses. diff --git a/docs/validation.md b/docs/validation.md index ef05b2c..f95dd54 100644 --- a/docs/validation.md +++ b/docs/validation.md @@ -7,7 +7,7 @@ Changes are checked with a local build and, when they affect the running system, - The image builds, passes `bootc container lint`, installs with bootc's composefs backend, Btrfs and systemd-boot, and boots through UEFI into GNOME with no failed services. - GNOME Initial Setup creates a conventional account. Password login and changes in `/etc`, `/var` and the home directory survive a reboot. - Secure Boot enrollment and enforced boot work through Microsoft-trusted shim. Firmware rejects a bootloader launch that bypasses shim, the kernel rejects an unsigned module, and the maintenance service restores stale or missing EFI files. Dakota's checker reports eight passes and two waits for key recognition. See [Secure Boot](secure-boot.md). -- NetworkManager and resolved provide networking. Docker with Compose and Buildx works alongside firewalld, as do rootless Podman and Distrobox. +- NetworkManager and resolved provide networking. Rootless Podman, `podman compose` and Distrobox work alongside firewalld. - Libvirt's default network starts with dnsmasq, and a KVM guest boots through libvirt. Tailscale starts and waits for enrollment. - Flatpak preinstallation installs the default apps and respects removals. Sushi renders previews from Files. - GNOME Shell extensions install from extensions.gnome.org. diff --git a/elements/core/desktop.bst b/elements/core/desktop.bst index 16007af..2651b65 100644 --- a/elements/core/desktop.bst +++ b/elements/core/desktop.bst @@ -49,7 +49,7 @@ depends: - core/appstream-cli.bst - core/eu-strip.bst - core/strip.bst -- core/docker.bst +- core/docker-compose.bst - core/ghostty.bst - dakota.bst:bluefin/xdg-terminal-exec.bst - dakota.bst:bluefin/tailscale.bst diff --git a/elements/core/docker-compose.bst b/elements/core/docker-compose.bst new file mode 100644 index 0000000..740ef30 --- /dev/null +++ b/elements/core/docker-compose.bst @@ -0,0 +1,24 @@ +kind: manual +description: Docker Compose from its pinned official binary image, used by podman compose + +sources: +- kind: docker + registry-url: 'docker:' + image: docker/compose-bin + architecture: amd64 + os: linux + # renovate: datasource=docker depName=docker.io/docker/compose-bin + track: v5.7.0 + ref: sha256:c34e6c54a19b3ac03edc915dd6115880c491a36fce89e0679962e5db6f36e81a + directory: image + +build-depends: +- dakota.bst:freedesktop-sdk.bst:public-stacks/runtime-gnu.bst + +variables: + strip-binaries: '' + +config: + install-commands: + # podman compose checks this plugin path itself, so Compose stays off PATH. + - install -Dm755 -t "%{install-root}/usr/libexec/docker/cli-plugins" image/docker-compose diff --git a/elements/core/docker.bst b/elements/core/docker.bst deleted file mode 100644 index 5719dd3..0000000 --- a/elements/core/docker.bst +++ /dev/null @@ -1,44 +0,0 @@ -kind: manual -description: Docker Engine, CLI, Compose and Buildx from the pinned official Docker image - -sources: -- kind: docker - registry-url: 'docker:' - image: library/docker - architecture: amd64 - os: linux - # renovate: datasource=docker depName=docker.io/library/docker - track: 29.9.3-dind - ref: sha256:fafc2949724b06fd4e4bc53c446a09149b750693f0abe7f444e9eec1e138fe65 - directory: image -- kind: local - path: files/docker - directory: config - -build-depends: -- dakota.bst:freedesktop-sdk.bst:public-stacks/runtime-gnu.bst - -runtime-depends: -- dakota.bst:freedesktop-sdk.bst:components/iptables.bst -- dakota.bst:freedesktop-sdk.bst:components/kmod.bst -- dakota.bst:freedesktop-sdk.bst:components/procps.bst -- dakota.bst:freedesktop-sdk.bst:components/ca-certificates.bst - -variables: - strip-binaries: '' - -config: - install-commands: - - install -Dm755 -t "%{install-root}/usr/bin" image/usr/local/bin/docker image/usr/local/bin/dockerd - # Keep Docker's bundled runtime helpers private so Podman's runtime stays - # independent. Only the Docker service adds this directory to its PATH. - # dockerd uses its embedded containerd, as in the official image. - - | - install -Dm755 -t "%{install-root}/usr/libexec/docker" \ - image/usr/local/bin/containerd-shim-runc-v2 image/usr/local/bin/ctr \ - image/usr/local/bin/runc image/usr/local/bin/docker-init image/usr/local/bin/docker-proxy - - | - install -Dm755 -t "%{install-root}/usr/libexec/docker/cli-plugins" \ - image/usr/local/libexec/docker/cli-plugins/docker-compose \ - image/usr/local/libexec/docker/cli-plugins/docker-buildx - - cp -a config/. "%{install-root}/" diff --git a/elements/dakota.bst b/elements/dakota.bst index 1428f77..bf3b449 100644 --- a/elements/dakota.bst +++ b/elements/dakota.bst @@ -8,8 +8,6 @@ sources: ref: 73c9e33df4cf5e5ed3c3bada73730708db4df09c - kind: patch path: patches/dakota/personal-os-secure-boot.patch -- kind: patch - path: patches/dakota/firewalld-iptables.patch - kind: patch path: patches/dakota/initramfs-firmware.patch diff --git a/files/docker/etc/docker/daemon.json b/files/docker/etc/docker/daemon.json deleted file mode 100644 index 09ffad6..0000000 --- a/files/docker/etc/docker/daemon.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "exec-opts": ["native.cgroupdriver=systemd"], - "log-driver": "journald" -} diff --git a/files/docker/usr/lib/systemd/system-preset/20-docker.preset b/files/docker/usr/lib/systemd/system-preset/20-docker.preset deleted file mode 100644 index f0aeba9..0000000 --- a/files/docker/usr/lib/systemd/system-preset/20-docker.preset +++ /dev/null @@ -1 +0,0 @@ -enable docker.service diff --git a/files/docker/usr/lib/systemd/system/docker.service b/files/docker/usr/lib/systemd/system/docker.service deleted file mode 100644 index ac29606..0000000 --- a/files/docker/usr/lib/systemd/system/docker.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Docker container engine -Documentation=https://docs.docker.com -After=network-online.target firewalld.service -Wants=network-online.target -RequiresMountsFor=/var/lib/docker -StartLimitIntervalSec=60 -StartLimitBurst=3 - -[Service] -Type=notify -Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin -ExecStart=/usr/bin/dockerd -ExecReload=/bin/kill -s HUP $MAINPID -Restart=on-failure -RestartSec=2 -TimeoutStartSec=0 -Delegate=yes -KillMode=process -LimitNOFILE=infinity -LimitNPROC=infinity -LimitCORE=infinity -TasksMax=infinity - -[Install] -WantedBy=multi-user.target diff --git a/files/docker/usr/lib/sysusers.d/docker.conf b/files/docker/usr/lib/sysusers.d/docker.conf deleted file mode 100644 index 914641d..0000000 --- a/files/docker/usr/lib/sysusers.d/docker.conf +++ /dev/null @@ -1 +0,0 @@ -g docker - diff --git a/files/system/usr/lib/systemd/user-preset/00-personal-os.preset b/files/system/usr/lib/systemd/user-preset/00-personal-os.preset index 582113f..4a025de 100644 --- a/files/system/usr/lib/systemd/user-preset/00-personal-os.preset +++ b/files/system/usr/lib/systemd/user-preset/00-personal-os.preset @@ -1 +1,2 @@ enable mise-bootstrap.service +enable podman.socket diff --git a/patches/dakota/firewalld-iptables.patch b/patches/dakota/firewalld-iptables.patch deleted file mode 100644 index ca3684a..0000000 --- a/patches/dakota/firewalld-iptables.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Personal OS maintainers -Subject: [PATCH] Add firewalld's iptables fix to Dakota's GNOME patch queue - -Dakota owns our GNOME junction, so carry the fix as one more patch in its -gnome-build-meta queue. The queued patch explains the change itself. - -diff --git a/patches/gnome-build-meta/personal-os-firewalld-iptables.patch b/patches/gnome-build-meta/personal-os-firewalld-iptables.patch -new file mode 100644 -index 0000000..477ad12 ---- /dev/null -+++ b/patches/gnome-build-meta/personal-os-firewalld-iptables.patch -@@ -0,0 +1,20 @@ -+Upstream-Status: Pending -+Exit: Drop when gnome-build-meta adds iptables to firewalld itself. -+Subject: firewalld: discover iptables during configuration -+ -+Docker uses firewalld's direct API even when firewalld uses nftables. -+Without iptables in the build sandbox, configure records /bin/false for -+its IPv4/IPv6 commands. Keep iptables available at build time and runtime. -+ -+diff --git a/elements/gnomeos-deps/firewalld.bst b/elements/gnomeos-deps/firewalld.bst -+index 4018dfb6..674db542 100644 -+--- a/elements/gnomeos-deps/firewalld.bst -++++ b/elements/gnomeos-deps/firewalld.bst -+@@ -17,6 +17,7 @@ build-depends: -+ - freedesktop-sdk.bst:components/libxslt.bst -+ -+ depends: -++- freedesktop-sdk.bst:components/iptables.bst -+ - freedesktop-sdk.bst:components/python3-nftables.bst -+ - freedesktop-sdk.bst:components/python3.bst -+ diff --git a/renovate.json b/renovate.json index bf70fdc..1ba4192 100644 --- a/renovate.json +++ b/renovate.json @@ -67,8 +67,8 @@ }, { "matchDatasources": ["docker"], - "matchPackageNames": ["docker.io/library/docker"], - "changelogUrl": "https://docs.docker.com/engine/release-notes/" + "matchPackageNames": ["docker.io/docker/compose-bin"], + "sourceUrl": "https://github.com/docker/compose" }, { "matchDatasources": ["docker"],