From 45691a049b4435d9a8b743a70e4d26b08502a333 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sat, 22 Oct 2022 20:27:17 +0200
Subject: [PATCH] [dockerfiles] fix user name/id variables

---
 modules/events-processors/docker/Dockerfile    | 8 ++++----
 modules/events-server-syslog/docker/Dockerfile | 8 ++++----
 modules/events-server-web/docker/Dockerfile    | 8 ++++----
 modules/events-server/docker/Dockerfile        | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
index f04efbf..26572b8 100644
--- a/modules/events-processors/docker/Dockerfile
+++ b/modules/events-processors/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
 ARG USER_NAME="container_user"
 ARG USER_UID=1000
-ARG USER_GID=$USER_ID
+ARG USER_GID=$USER_UID
 
 
 ENV SERVER_DATA_DIR="/app/data" \
@@ -19,12 +19,12 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${APP_FILES} /app/
 
 
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+RUN groupadd --gid $USER_GID $USER_NAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USER_NAME \
     && chown -R $USER_UID:$USER_GID /app/
 
 
-USER $USER_ID:$USER_GID
+USER $USER_UID:$USER_GID
 
 
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server-syslog/docker/Dockerfile b/modules/events-server-syslog/docker/Dockerfile
index 1ad7691..c297549 100644
--- a/modules/events-server-syslog/docker/Dockerfile
+++ b/modules/events-server-syslog/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
 ARG USER_NAME="container_user"
 ARG USER_UID=1000
-ARG USER_GID=$USER_ID
+ARG USER_GID=$USER_UID
 
 
 ENV SERVER_DATA_DIR="/app/data" \
@@ -24,12 +24,12 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${APP_FILES} /app/
 
 
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+RUN groupadd --gid $USER_GID $USER_NAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USER_NAME \
     && chown -R $USER_UID:$USER_GID /app/
 
 
-USER $USER_ID:$USER_GID
+USER $USER_UID:$USER_GID
 
 
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server-web/docker/Dockerfile b/modules/events-server-web/docker/Dockerfile
index b706a83..497a834 100644
--- a/modules/events-server-web/docker/Dockerfile
+++ b/modules/events-server-web/docker/Dockerfile
@@ -5,7 +5,7 @@ ARG KAFKATORIO_VERSION
 ARG APP_FILES="build/"
 ARG USER_NAME="container_user"
 ARG USER_UID=1000
-ARG USER_GID=$USER_ID
+ARG USER_GID=$USER_UID
 
 
 ENV SERVER_DATA_DIR="/app/data" \
@@ -23,12 +23,12 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${APP_FILES} /app/
 
 
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+RUN groupadd --gid $USER_GID $USER_NAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USER_NAME \
     && chown -R $USER_UID:$USER_GID /app/
 
 
-USER $USER_ID:$USER_GID
+USER $USER_UID:$USER_GID
 
 
 ENTRYPOINT /app/bin/run
diff --git a/modules/events-server/docker/Dockerfile b/modules/events-server/docker/Dockerfile
index 44fe964..697c11e 100644
--- a/modules/events-server/docker/Dockerfile
+++ b/modules/events-server/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
 ARG USER_NAME="container_user"
 ARG USER_UID=1000
-ARG USER_GID=$USER_ID
+ARG USER_GID=$USER_UID
 
 
 ENV SERVER_DATA_DIR="/app/data" \
@@ -24,12 +24,12 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${APP_FILES} /app/
 
 
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+RUN groupadd --gid $USER_GID $USER_NAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USER_NAME \
     && chown -R $USER_UID:$USER_GID /app/
 
 
-USER $USER_ID:$USER_GID
+USER $USER_UID:$USER_GID
 
 
 ENTRYPOINT /app/bin/run