Merge upstream develop

Author: github-actions[bot]

.gitlab/ci/deploy_services.yml

@@ -116,6 +116,6 @@ moderation-deploy-manifest-production:
     - .moderation-deploy-workflow
     - .service-deploy-manifest
   variables:
-    MANIFEST_QUICK_TARGETS: inventory/polycentric-east/moderation-service.yml:polycentriceast
+    MANIFEST_QUICK_TARGETS: inventory/polycentric-east/moderation.yml:polycentriceast
   needs:
     - moderation-deploy-image-production

services/common/deps.sh services/common/build-deps.shservices/common/deps.sh renamed to services/common/build-deps.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -eu
+
+# Runtime shared libraries the release binaries link against: rdkafka pulls
+# in SASL (libsasl2.so.2) and SSL (libssl.so.3); ca-certificates is needed
+# for outbound TLS. These are the runtime counterparts of build-deps.sh.
+apt-get update
+apt-get install -y --no-install-recommends \
+    libsasl2-2 \
+    libssl3 \
+    ca-certificates
+rm -rf /var/lib/apt/lists/*

services/common/runtime-deps.sh

@@ -9,13 +9,15 @@ COPY packages packages
 COPY services services
 COPY tools tools
 
-RUN services/common/deps.sh
+RUN services/common/build-deps.sh
 
 RUN cargo build --release --package moderation-service
 RUN cargo build --release --package moderation-migration
 
 FROM rust:1.95-slim
 WORKDIR /app
+COPY services/common/runtime-deps.sh runtime-deps.sh
+RUN sh runtime-deps.sh
 COPY --from=build /app/target/release/moderation-service /app/moderation-service
 COPY --from=build /app/target/release/moderation-migration /app/moderation-migration
 CMD ["/app/moderation-service"]

services/moderation/Dockerfile

@@ -9,13 +9,15 @@ COPY packages packages
 COPY services services
 COPY tools tools
 
-RUN services/common/deps.sh
+RUN services/common/build-deps.sh
 
 RUN cargo build --release --package server
 RUN cargo build --release --package migration
 
 FROM rust:1.95-slim
 WORKDIR /app
+COPY services/common/runtime-deps.sh runtime-deps.sh
+RUN sh runtime-deps.sh
 COPY --from=build /app/target/release/server /app/server
 COPY --from=build /app/target/release/migration /app/migration
 CMD ["/app/server"]