fix(collabora): keep collabora/code:latest as BUILD_FROM in build.json

build.json is where every add-on in this repo records the upstream image it
tracks, and it is what the updater bot rewrites. Hardcoding the Collabora tag in
the Dockerfile and putting the Debian base in build.json inverted that.

BUILD_FROM is now collabora/code:latest again and feeds the build stage the
payload is copied from; the Debian runtime base is named in the Dockerfile,
where it is an implementation detail of the add-on rather than the upstream
being tracked.

Co-Authored-By: Claude <noreply@anthropic.com>

collabora/CHANGELOG.md

@@ -1,6 +1,6 @@
  
 ## 26.04.2.4.1 (2026-07-26)
-- Rebuild on a Debian base: upstream turned collabora/code into a distroless image with no shell, which broke the addon build entirely. Collabora is now copied from the official image onto ghcr.io/hassio-addons/debian-base, and the addon ships its own launcher in place of the removed /start-collabora-online.sh
+- Rebuild on a Debian base: upstream turned collabora/code into a distroless image with no shell, which broke the addon build entirely. collabora/code:latest stays the tracked upstream image in build.json, but is now a build stage whose payload is copied onto ghcr.io/hassio-addons/debian-base, and the addon ships its own launcher in place of the removed /start-collabora-online.sh
 - Fix version numbering: releases on CollaboraOnline/online are now Helm charts only, which had renumbered the addon from 25.4.9.2 down to 1.3.0 and hid updates. The version is tracked from the collabora/code Docker Hub tags again
 - `server_name` is now passed to Collabora, fixing `Your browser has been unable to connect to the Collabora server` behind a reverse proxy
 - `domain1` was never passed to Collabora at all (the script read a `domain` option that does not exist, and recent Collabora releases dropped that variable). It is now deprecated and applied as `server_name`

collabora/Dockerfile

@@ -18,22 +18,25 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 
 ###############################################################################
-# Get Collabora Online from the official image
+# Get Collabora Online from the official image (BUILD_FROM, see build.json)
 #
 # Upstream rebuilt collabora/code as a Nix-based distroless image: /bin and
-# /sbin are empty, so it can no longer be used as BUILD_FROM (s6, bashio and
-# every RUN need a shell). Only the Collabora payload is taken from it, on top
-# of a normal Debian base.
+# /sbin are empty, so it can no longer be the base of the add-on itself, as s6,
+# bashio and every RUN need a shell. It stays the tracked upstream image, and
+# only the Collabora payload is copied out of it onto a Debian runtime.
 #
 # Copy only what belongs to Collabora. Do NOT copy /etc or /nix: in that image
 # /etc/resolv.conf, /etc/hosts, /etc/passwd, /etc/group and /etc/nsswitch.conf
 # are symlinks into /nix/store, and importing them breaks DNS resolution and
 # wipes the base image users.
 ###############################################################################
-FROM collabora/code:latest AS collabora
-
 # hadolint ignore=DL3006
-FROM ${BUILD_FROM}
+FROM ${BUILD_FROM} AS collabora
+
+###############################################################################
+# Build the actual add-on on a base that has a shell
+###############################################################################
+FROM ghcr.io/hassio-addons/debian-base:9.3.0
 
 ##################
 # 2 Modify Image #

collabora/build.json

@@ -1,6 +1,6 @@
 {
   "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/debian-base:9.3.0",
-    "amd64": "ghcr.io/hassio-addons/debian-base:9.3.0"
+    "aarch64": "collabora/code:latest",
+    "amd64": "collabora/code:latest"
   }
 }