From 0ca53a5d35bca5b8182685d6b17b7170d03423cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 25 Feb 2025 10:54:10 +0100
Subject: [PATCH] Revert "Debug: Run docker commands on their own"

This reverts commit df020b0aab0a56f8b59b1526f5253cd723917da7.
---
 scm-packaging/docker/Dockerfile.debian | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian
index 92cebf300f..b6d1366e9a 100644
--- a/scm-packaging/docker/Dockerfile.debian
+++ b/scm-packaging/docker/Dockerfile.debian
@@ -39,13 +39,17 @@ COPY --from=jre-build /javaruntime "${JAVA_HOME}"
 COPY build/docker/etc /etc
 COPY build/docker/opt /opt
 
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates
-RUN useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm
-RUN mkdir -p ${SCM_HOME} ${CACHE_DIR}
-RUN chmod +x /opt/scm-server/bin/scm-server
-RUN chown 1000:0 ${SCM_HOME} ${CACHE_DIR}
-RUN chmod -R g=u ${SCM_HOME} ${CACHE_DIR}
+RUN set -x \
+ && apt-get update \
+ # libfreetype6 libfontconfig1 graphviz
+ && apt-get install -y --no-install-recommends libfreetype6 libfontconfig1 graphviz mercurial bash ca-certificates \
+ # use gid 0 for openshift compatibility
+ && useradd -d "${SCM_HOME}" -u 1000 -g 0 -m -s /bin/bash scm \
+ && mkdir -p ${SCM_HOME} ${CACHE_DIR} \
+ && chmod +x /opt/scm-server/bin/scm-server \
+ # set permissions to group 0 for openshift compatibility
+ && chown 1000:0 ${SCM_HOME} ${CACHE_DIR} \
+ && chmod -R g=u ${SCM_HOME} ${CACHE_DIR}
 
 USER 1000