Add Debian 13 (Trixie) .deb build support

Author: elonen

Dockerfile.client

@@ -1,4 +1,5 @@
-FROM node:24.2-bookworm-slim
+ARG DEBIAN_VER=bookworm
+FROM node:24-${DEBIAN_VER}-slim
 
 # Install system packages
 RUN apt-get -qy update >/dev/null

Dockerfile.org-python

@@ -1,4 +1,6 @@
-FROM debian:bookworm-slim AS python-bookworm-slim
+ARG DEBIAN_VER=bookworm
+ARG PYTHON_VER=python3.11
+FROM debian:${DEBIAN_VER}-slim AS python-slim
 
 RUN set -eux; \
     apt-get update; \
@@ -8,7 +10,6 @@ RUN set -eux; \
         dh-virtualenv \
 	dh-python \
         python3 \
-        python3.11 \
         python3-dev \
         python3-pip \
         python3-setuptools \
@@ -19,9 +20,13 @@ RUN set -eux; \
         ; \
     rm -rf /var/lib/apt/lists/*;
 
+# Re-declare ARG after FROM to make it available in this stage
+ARG PYTHON_VER=python3.11
+RUN apt-get update && apt-get install -y --no-install-recommends ${PYTHON_VER} ${PYTHON_VER}-venv && rm -rf /var/lib/apt/lists/*
+
 # ----------------------------------
 
-FROM python-bookworm-slim AS build
+FROM python-slim AS build
 
 # Install system packages
 RUN apt-get -qy update >/dev/null

Dockerfile.server

@@ -1,8 +1,9 @@
-FROM rust:1.87-slim-bookworm AS rust-bookworm-slim
+ARG DEBIAN_VER=bookworm
+FROM rust:1-slim-${DEBIAN_VER} AS rust-slim
 
 # ----------------------------------
 
-FROM rust-bookworm-slim AS chef
+FROM rust-slim AS chef
 
 # Create regular user
 ARG USER=docker
@@ -20,12 +21,14 @@ USER ${UID}:${GID}
 RUN cargo install cargo-deb
 USER root
 
-# Add deb-multimedia repository (for a more recent ffmpeg)
-RUN apt-get -qy update
-RUN apt-get -qy install gnupg2 wget
-RUN wget -q https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2024.9.1_all.deb
-RUN dpkg -i deb-multimedia-keyring_2024.9.1_all.deb
-RUN echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list
+# Add deb-multimedia repository (for a more recent ffmpeg) - only needed for bookworm
+ARG DEBIAN_VER=bookworm
+RUN apt-get -qy update && apt-get -qy install gnupg2 wget
+RUN if [ "$DEBIAN_VER" = "bookworm" ]; then \
+        wget -q https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2024.9.1_all.deb && \
+        dpkg -i deb-multimedia-keyring_2024.9.1_all.deb && \
+        echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list; \
+    fi
 RUN apt-get -qy update
 
 # Install system packages
@@ -45,7 +48,8 @@ RUN apt-get -qy install sqlite3 >/dev/null
 RUN apt-get -qy install libssl-dev >/dev/null
 RUN apt-get -qy install libsqlite3-dev >/dev/null
 RUN apt-get -qy install protobuf-compiler >/dev/null
-RUN apt-get -qy install python3 python3.11 python3.11-venv >/dev/null
+ARG PYTHON_VER=python3.11
+RUN apt-get -qy install python3 ${PYTHON_VER} ${PYTHON_VER}-venv >/dev/null
 
 # Switch to regular user
 RUN mkdir -p /app

Makefile

@@ -19,17 +19,39 @@ default:
 clean-debian:
 	rm -rf dist_deb
 
+# Helper function to test if a Docker base image is available
+define test_base_image
+	@docker build --platform linux/$(1) -q - <<< "FROM rust:1-slim-$(2)" >/dev/null 2>&1
+endef
+
 debian-docker:
-	for plat in arm64 amd64; do \
-		cd server; TARGET_ARCH=$$plat make debian-docker; cd ..; \
-		cd organizer; TARGET_ARCH=$$plat make debian-docker; cd ..; \
+	@echo "Building Debian packages for multiple distributions..."
+	rm -rf dist_deb && mkdir -p dist_deb
+	for debver in bookworm trixie; do \
+		echo ""; \
+		echo "=== Checking availability for Debian $$debver ==="; \
+		if docker build --platform linux/amd64 -q - <<< "FROM rust:1-slim-$$debver" >/dev/null 2>&1; then \
+			echo "=== Building packages for Debian $$debver ==="; \
+			rm -rf server/dist_deb client/dist_deb organizer/basic_folders/dist_deb; \
+			for plat in arm64 amd64; do \
+				echo "--- Building server for $$debver/$$plat ---"; \
+				(cd server && DEBIAN_VER=$$debver TARGET_ARCH=$$plat make debian-docker); \
+				echo "--- Building organizer for $$debver/$$plat ---"; \
+				(cd organizer && DEBIAN_VER=$$debver TARGET_ARCH=$$plat make debian-docker); \
+			done; \
+			echo "--- Building client for $$debver ---"; \
+			(cd client && DEBIAN_VER=$$debver make debian-docker); \
+			echo "--- Collecting $$debver packages ---"; \
+			cp client/dist_deb/*.deb dist_deb/ 2>/dev/null || true; \
+			cp server/dist_deb/*.deb dist_deb/ 2>/dev/null || true; \
+			cp organizer/basic_folders/dist_deb/*.deb dist_deb/ 2>/dev/null || true; \
+		else \
+			echo "=== Skipping $$debver (base image not available) ==="; \
+		fi; \
 	done
-	cd client && make debian-docker
-	mkdir -p dist_deb
-	cp client/dist_deb/* dist_deb/
-	cp server/dist_deb/* dist_deb/
-	cp organizer/basic_folders/dist_deb/* dist_deb/
-	rm dist_deb/*dbgsym* dist_deb/built.*.* 2>/dev/null || true
+	rm dist_deb/*dbgsym* 2>/dev/null || true
+	@echo ""
+	@echo "=== Built packages ==="
 	ls -l dist_deb/
 
 clean:	clean-debian

client/Makefile

@@ -6,6 +6,9 @@ PACKAGE=clapshot_client
 UID=$(shell id -u)
 GID=$(shell id -g)
 
+# Debian version (can be overridden via environment)
+DEBIAN_VER ?= bookworm
+
 CLIENT_DEPS=$(shell find src/ public/ package*.json tsconfig.json vite.config.ts -type f 2>/dev/null) $(shell find ../protobuf/proto -type f)
 DEB_DEPS=$(shell find debian/ -type f)
 
@@ -22,7 +25,7 @@ npm-deps:
 	cd ../protobuf/libs/typescript && make
 
 docker: clean
-	cd .. && DOCKER_BUILDKIT=1 docker build -t ${PACKAGE}:${PACKAGE_VERSION} -f Dockerfile.client .
+	cd .. && DOCKER_BUILDKIT=1 docker build -t ${PACKAGE}:${PACKAGE_VERSION} --build-arg DEBIAN_VER=${DEBIAN_VER} -f Dockerfile.client .
 	docker tag ${PACKAGE}:${PACKAGE_VERSION} ${PACKAGE}:latest
 
 
@@ -42,21 +45,27 @@ debian-local:
 	dpkg-buildpackage -us -uc -b
 
 docker-deb:
-	cd .. && DOCKER_BUILDKIT=1 docker build -t ${PACKAGE}:${PACKAGE_VERSION} --build-arg TARGET=deb  -f Dockerfile.client .
+	cd .. && DOCKER_BUILDKIT=1 docker build -t ${PACKAGE}:${PACKAGE_VERSION} --build-arg TARGET=deb --build-arg DEBIAN_VER=${DEBIAN_VER} -f Dockerfile.client .
 	docker tag ${PACKAGE}:${PACKAGE_VERSION} ${PACKAGE}:deb
 
-debian-docker: dist_deb/built.docker
+debian-docker: dist_deb/built.${DEBIAN_VER}.docker
 
-dist_deb/built.docker: ${CLIENT_DEPS} ${DEB_DEPS} ../Dockerfile.client
+dist_deb/built.${DEBIAN_VER}.docker: ${CLIENT_DEPS} ${DEB_DEPS} ../Dockerfile.client
+	@echo "Building client for Debian ${DEBIAN_VER}"
 	@which jq || (echo "ERROR: Please install jq first." && exit 1)
-	rm -rf dist_deb
 	mkdir -p dist_deb
 	$(MAKE) docker-deb
 	$(eval PVER=$(shell jq -r '.version' package.json))
 	test -n ${PVER}
 	$(eval PKGDIR=${PACKAGE}-${PVER})
-	$(eval CMD="mkdir -p /deb/ && cp -a /build /deb/${PKGDIR} && cd /deb/${PKGDIR}/client && make debian-local && mv /deb/${PKGDIR}/*.deb /deb/ && rm -rf /deb/${PKGDIR} && chown -R ${UID}:${GID} /deb")
-	docker run --rm --mount type=bind,source="$$(pwd)/dist_deb",target="/deb" --user root ${PACKAGE}:deb  bash -c ${CMD}
+	docker run --rm --mount type=bind,source="$$(pwd)/dist_deb",target="/deb" --user root ${PACKAGE}:deb \
+		bash -c "mkdir -p /deb/ && cp -a /build /deb/${PKGDIR} && cd /deb/${PKGDIR}/client && make debian-local && cp /deb/${PKGDIR}/*.deb /deb/ && rm -rf /deb/${PKGDIR} && chown -R ${UID}:${GID} /deb"
+	@# Rename .deb files to include Debian version (skip if already contains it)
+	for f in dist_deb/*.deb; do \
+		case "$$f" in *_${DEBIAN_VER}_*) continue ;; esac; \
+		newname=$$(echo "$$f" | sed -E 's/(_[0-9.]+-?[0-9]*_)/\1${DEBIAN_VER}_/'); \
+		[ "$$f" != "$$newname" ] && mv "$$f" "$$newname" || true; \
+	done
 	touch $@
 
 dev-local: npm-deps

client/debian/changelog

@@ -1,4 +1,4 @@
-clapshot-client (0.9.2) bookworm; urgency=low
+clapshot-client (0.9.2) unstable; urgency=low
 
   * New feature: Comment export to EDL, Premiere XML, CSV, SRT, and OTIO formats
   * New export dialog UI in NavBar

organizer/basic_folders/Makefile

@@ -11,6 +11,14 @@ else
   PLATFORM_STR := --platform linux/$(TARGET_ARCH)
 endif
 
+# Debian version and Python version (can be overridden via environment)
+DEBIAN_VER ?= bookworm
+ifeq ($(DEBIAN_VER),trixie)
+  PYTHON_VER ?= python3.13
+else
+  PYTHON_VER ?= python3.11
+endif
+
 # Configurable paths and settings
 VENV := _venv
 PYTHON := $(VENV)/bin/python
@@ -21,10 +29,10 @@ PY_SRC := $(wildcard *.py) $(wildcard organizer/**/*.py) $(DEPS_SRC)
 
 DEB_SRC := debian/* README* LICENSE* requirements.txt setup.py pyproject.toml
 
-DOCKER_IMG_NAME := clapshot_org_basic_folders_${ARCH}
+DOCKER_IMG_NAME := clapshot_org_basic_folders_${DEBIAN_VER}_${ARCH}
 DEV_VERSION := $(shell git rev-parse --short HEAD || date +"%Y-%m-%d" || echo "dev")
 
-PROTOLIB := clapshot_grpc-0.0.0+dev.tar.gz
+PROTOLIB := clapshot_grpc-0.0.0+dev-py3-none-any.whl
 TARGET_BIN := $(VENV)/bin/clapshot-organizer-basic-folders
 
 
@@ -73,7 +81,7 @@ docker:
 	@echo "NOTE! Creating current user and UID/GID in Docker so bind mount is owned by it."
 	@echo "Otherwise you wouldn't be able to access it without root privileges."
 	@echo "-------------------------------------------------------------------------------"
-	cd ../.. && DOCKER_BUILDKIT=1 docker build $(PLATFORM_STR) -t ${DOCKER_IMG_NAME}:${DEV_VERSION} --build-arg USER=${USER} --build-arg UID=${UID} --build-arg GID=${GID} -f Dockerfile.org-python .
+	cd ../.. && DOCKER_BUILDKIT=1 docker build $(PLATFORM_STR) -t ${DOCKER_IMG_NAME}:${DEV_VERSION} --build-arg USER=${USER} --build-arg UID=${UID} --build-arg GID=${GID} --build-arg DEBIAN_VER=${DEBIAN_VER} --build-arg PYTHON_VER=${PYTHON_VER} -f Dockerfile.org-python .
 	docker tag ${DOCKER_IMG_NAME}:${DEV_VERSION} ${DOCKER_IMG_NAME}:latest
 
 dist_deb/built.${ARCH}.target: ${DEB_SRC} deps/$(PROTOLIB)
@@ -87,16 +95,25 @@ test-local: $(TARGET_BIN)
 
 debian-local: dist_deb/built.${ARCH}.target
 
-debian-docker: dist_deb/built.${ARCH}.docker
+debian-docker: dist_deb/built.${DEBIAN_VER}.${ARCH}.docker
 
-dist_deb/built.${ARCH}.docker: ${PY_SRC} ${DEB_SRC} ../../Dockerfile.org-python
+dist_deb/built.${DEBIAN_VER}.${ARCH}.docker: ${PY_SRC} ${DEB_SRC} ../../Dockerfile.org-python
 	@echo "-------------------------------------------------------------------------------"
+	@echo "Building organizer for Debian ${DEBIAN_VER} (${ARCH}) with ${PYTHON_VER}"
 	@echo "NOTE! Creating current user and UID/GID in Docker so bind mount is owned by it."
 	@echo "Otherwise you wouldn't be able to access it without root privileges."
 	@echo "-------------------------------------------------------------------------------"
 	@mkdir -p dist_deb
-	cd ../.. && DOCKER_BUILDKIT=1 docker build $(PLATFORM_STR) -t ${DOCKER_IMG_NAME}:${DEV_VERSION} --build-arg USER=${USER} --build-arg UID=${UID} --build-arg GID=${GID} -f Dockerfile.org-python .
+	cd ../.. && DOCKER_BUILDKIT=1 docker build $(PLATFORM_STR) -t ${DOCKER_IMG_NAME}:${DEV_VERSION} --build-arg USER=${USER} --build-arg UID=${UID} --build-arg GID=${GID} --build-arg DEBIAN_VER=${DEBIAN_VER} --build-arg PYTHON_VER=${PYTHON_VER} -f Dockerfile.org-python .
 	docker tag ${DOCKER_IMG_NAME}:${DEV_VERSION} ${DOCKER_IMG_NAME}:latest
-	$(eval CMD="cd /build/organizer/basic_folders && cp -r --preserve=mode,ownership,timestamps /deb ./dist_deb && ls -l ./dist_deb && make debian-local && cp dist_deb/*.* /deb/ && chown -R ${UID}:${GID} /deb")
-	docker run --rm --mount type=bind,source="$$(pwd)/dist_deb",target="/deb" --user root ${DOCKER_IMG_NAME}:latest   bash -c ${CMD}
+	docker run --rm $(PLATFORM_STR) --mount type=bind,source="$$(pwd)/dist_deb",target="/deb" --user root ${DOCKER_IMG_NAME}:latest \
+		bash -c "cd /build/organizer/basic_folders && cp -r --preserve=mode,ownership,timestamps /deb ./dist_deb && \
+			sed -i 's/python3\\.11/${PYTHON_VER}/g' debian/control && \
+			PYTHON_VER=${PYTHON_VER} make debian-local && cp dist_deb/*.deb /deb/ && chown -R ${UID}:${GID} /deb"
+	@# Rename .deb files to include Debian version (skip if already contains it)
+	for f in dist_deb/*.deb; do \
+		case "$$f" in *_${DEBIAN_VER}_*) continue ;; esac; \
+		newname=$$(echo "$$f" | sed -E 's/(_[0-9.]+-?[0-9]*_)/\1${DEBIAN_VER}_/'); \
+		[ "$$f" != "$$newname" ] && mv "$$f" "$$newname" || true; \
+	done
 	touch $@

organizer/basic_folders/debian/changelog

@@ -1,4 +1,4 @@
-clapshot-organizer-basic-folders (0.9.2) bookworm; urgency=low
+clapshot-organizer-basic-folders (0.9.2) unstable; urgency=low
 
   * (Follow client and server versioning)
 

organizer/basic_folders/debian/rules

@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
+# Python version can be overridden via environment (default: python3.11 for bookworm)
+PYTHON_VER ?= python3.11
+
 %:
 	dh $@ --with python-virtualenv
 
 override_dh_virtualenv:
-	dh_virtualenv --builtin-venv --python python3.11 \
-		--preinstall deps/clapshot_grpc-0.0.0+dev.tar.gz \
-		--extra-pip-arg --no-build-isolation
+	dh_virtualenv --builtin-venv --python $(PYTHON_VER) \
+		--preinstall deps/clapshot_grpc-0.0.0+dev-py3-none-any.whl

protobuf/libs/python/Makefile

@@ -1,7 +1,7 @@
 PACKAGE_NAME := clapshot_grpc
 PACKAGE_VERSION := 0.0.0+dev
 
-TARGET_FILE := dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
+TARGET_FILE := dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-py3-none-any.whl
 
 VENV := _venv
 PYTHON := $(VENV)/bin/python
@@ -21,9 +21,9 @@ PY_SRC := $(wildcard *.py) $(wildcard src/**/*.py) $(wildcard ../../protobuf/pro
 $(TARGET_FILE): $(PY_SRC) $(VENV) $(MYPY) $(GENERATED_DIR)/__init__.py
 	$(MYPY) src --no-strict-optional
 	$(PYTHON) -m pip install build
-	$(PYTHON) -m build --sdist
+	$(PYTHON) -m build --wheel
 	@echo "------- Build complete -------"
-	@echo "pip install dist/$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz"
+	@echo "pip install $(TARGET_FILE)"
 
 package: $(TARGET_FILE)