Merge branch 'release/17.0' into dev

Author: openprojectci

.github/workflows/docker.yml

@@ -294,7 +294,7 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v6
         with:
-          name: digests-${{ inputs.tag }}-${{ matrix.target }}-${{ matrix.digest }}
+          name: digests-${{ inputs.tag }}-${{ matrix.target }}--${{ matrix.digest }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -310,7 +310,7 @@ jobs:
       - name: Merge digests
         uses: actions/upload-artifact/merge@v6
         with:
-          pattern: "digests-${{ inputs.tag }}-${{ matrix.target }}-${{ matrix.digest }}*"
+          pattern: "digests-${{ inputs.tag }}-${{ matrix.target }}--*"
           overwrite: true
           name: "merged-digests-${{ inputs.tag }}-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}"
       - name: Download digests

bin/build-docker-aio

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker build -t openproject/openproject:$(git rev-parse --abbrev-ref HEAD | tr '/' '-') --build-arg DEBIAN_BASE=bookworm -f docker/prod/Dockerfile .
+

bin/build-docker-slim

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker build -t openproject/openproject:$(git rev-parse --abbrev-ref HEAD | tr '/' '-')-slim --build-arg BIM_SUPPORT=false --target slim -f docker/prod/Dockerfile .
+

docker/prod/Dockerfile

@@ -3,7 +3,7 @@ ARG DEBIAN_BASE="trixie"
 # Add SBOM scan context for intermediate steps
 ARG BUILDKIT_SBOM_SCAN_CONTEXT=true
 ARG BUILDKIT_SBOM_SCAN_STAGE=true
-FROM ruby:${RUBY_VERSION}-${DEBIAN_BASE} AS base
+FROM ruby:${RUBY_VERSION}-slim-${DEBIAN_BASE} AS base
 LABEL maintainer="operations@openproject.com"
 
 ARG NODE_VERSION="22.21.0"

docker/prod/setup/preinstall-common.sh

@@ -29,6 +29,7 @@ apt-get upgrade -y
 
 apt-get install -yq --no-install-recommends \
 	curl \
+	wget \
 	file \
 	gnupg2 \
 	lsb-release
@@ -51,7 +52,9 @@ apt-get install -yq --no-install-recommends \
 	imagemagick \
 	libclang-dev \
 	libjemalloc2 \
-	git
+	git \
+	build-essential \
+	libyaml-dev \
 
 for version in $PGVERSION_CHOICES ; do
 	apt-get install -yq --no-install-recommends postgresql-client-$version