From caf171e3a29a33a2c467e7cadf49167b7774b111 Mon Sep 17 00:00:00 2001
From: Pavel Sorokin <60606414+pavel-snyk@users.noreply.github.com>
Date: Wed, 10 Apr 2024 21:27:36 +0200
Subject: [PATCH] fix(docker): set workdir for rhel-ubi docker images

---
 dockerfiles/Dockerfile.ubi      |  1 -
 dockerfiles/base/Dockerfile.ubi | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dockerfiles/Dockerfile.ubi b/dockerfiles/Dockerfile.ubi
index 0d170233f..ea11db970 100644
--- a/dockerfiles/Dockerfile.ubi
+++ b/dockerfiles/Dockerfile.ubi
@@ -8,7 +8,6 @@ ARG BROKER_TYPE
 ENV BROKER_TYPE=${BROKER_TYPE}
 
 # Generate default accept filter
-USER root
 RUN broker init $BROKER_TYPE
 
 USER snyk
diff --git a/dockerfiles/base/Dockerfile.ubi b/dockerfiles/base/Dockerfile.ubi
index b8fa0244f..7e3cc919a 100644
--- a/dockerfiles/base/Dockerfile.ubi
+++ b/dockerfiles/base/Dockerfile.ubi
@@ -39,11 +39,6 @@ LABEL org.opencontainers.image.authors="team-broker" \
 
 ENV PATH="/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:${PATH}"
 
-COPY --from=broker-builder /opt/app-root/src/.npm-global /opt/app-root/src/.npm-global
-COPY --from=node-base /tmp/node/bin/node /usr/bin/node
-COPY config.default.json /home/node/config.default.json
-COPY defaultFilters /home/node/defaultFilters
-
 RUN <<EOF
     set -ex
     yum upgrade --assumeyes
@@ -51,7 +46,7 @@ RUN <<EOF
     rm -rf /var/cache/yum
     # create default user and group
     groupadd --gid 10001 snyk
-    useradd --gid 10001 --no-create-home --shell /sbin/nologin --uid 10001 snyk
+    useradd --gid 10001 --shell /sbin/nologin --uid 10001 snyk
     # remove non-used OS packages
     rpm --erase --nodeps curl
     rpm --erase --nodeps python3-urllib3
@@ -94,4 +89,10 @@ RUN <<EOF
     rpm --erase --nodeps rpm-libs
 EOF
 
+COPY --from=broker-builder /opt/app-root/src/.npm-global /opt/app-root/src/.npm-global
+COPY --from=node-base /tmp/node/bin/node /usr/bin/node
+COPY --chown=snyk:snyk config.default.json /home/snyk/config.default.json
+COPY --chown=snyk:snyk defaultFilters /home/snyk/defaultFilters
+
+WORKDIR /home/snyk
 USER snyk