From 1973a08297267c429b6f8ebeba8b48766276c1e7 Mon Sep 17 00:00:00 2001
From: ipatini <ipatini@mail.ntua.gr>
Date: Sat, 20 Apr 2024 15:58:12 +0300
Subject: [PATCH] Reverted changes in Dockerfile

Change-Id: Ibe4865ad417077cfc79559949f7a531bb3d04ce1
---
 resource-discovery/Dockerfile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/resource-discovery/Dockerfile b/resource-discovery/Dockerfile
index 2e95898..3d13346 100644
--- a/resource-discovery/Dockerfile
+++ b/resource-discovery/Dockerfile
@@ -20,22 +20,21 @@ RUN wget  --progress=dot:giga -O /usr/local/bin/dumb-init \
           https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 && \
     chmod +x /usr/local/bin/dumb-init
 
-# Add RD user
-ARG RD_USER=root
-#ARG RD_USER=rd
-#RUN mkdir ${RD_HOME} && \
-#    addgroup ${RD_USER} && \
-#    adduser --home ${RD_HOME} --no-create-home --ingroup ${RD_USER} --disabled-password ${RD_USER} && \
-#    chown ${RD_USER}:${RD_USER} ${RD_HOME}
-
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
         netcat=1.218-4ubuntu1 \
-        iputils-ping=3:20211215-1 \
-        telnet=0.17-44build1 \
-        vim=2:8.2.3995-1ubuntu2.16 \
-        net-tools=1.60+git20181103.0eebece-1ubuntu5 \
     && rm -rf /var/lib/apt/lists/*
+#        iputils-ping=3:20211215-1 \
+#        telnet=0.17-44build1 \
+#        vim=2:8.2.3995-1ubuntu2.16 \
+#        net-tools=1.60+git20181103.0eebece-1ubuntu5 \
+
+# Add RD user
+ARG RD_USER=rd
+RUN mkdir ${RD_HOME} && \
+    addgroup ${RD_USER} && \
+    adduser --home ${RD_HOME} --no-create-home --ingroup ${RD_USER} --disabled-password ${RD_USER} && \
+    chown ${RD_USER}:${RD_USER} ${RD_HOME}
 
 # Set User and Workdir
 USER ${RD_USER}
@@ -46,7 +45,6 @@ COPY --chown=${RD_USER}:${RD_USER} --from=rd-builder /app/dependencies
 COPY --chown=${RD_USER}:${RD_USER} --from=rd-builder /app/spring-boot-loader    ${BASEDIR}
 COPY --chown=${RD_USER}:${RD_USER} --from=rd-builder /app/snapshot-dependencies ${BASEDIR}
 COPY --chown=${RD_USER}:${RD_USER} --from=rd-builder /app/application           ${BASEDIR}
-#COPY --chown=${RD_USER}:${RD_USER} --from=rd-builder /app/run.sh                ${BASEDIR}
 
 COPY --chown=${RD_USER}:${RD_USER} run.sh                                       ${BASEDIR}
 COPY --chown=${RD_USER}:${RD_USER} wait_for_mongodb.sh                          ${BASEDIR}