From 637cb2237158e3cc8f9860fd36f424008a2a22bf Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Wed, 3 Sep 2025 16:10:03 +0100
Subject: [PATCH] Fix docker volume permission issue

Docker volume /var/information-coordinator-service/database is failing to get necessary permission because of the different uid used in init container.
This fixes that issue by add that specific location and permission while building docker image itself, So the initcontainer is not necessary.
General dockerfile guildlines aligned.

Issue-ID: INT-193
Change-Id: Ia6748a4a592dbd8a6a8ce71b8285499f32fc9682
Signed-off-by: aravind.est <aravindhan.a@est.tech>
(cherry picked from commit 9f36155d5da35597102b83f57b82b02f89bbe156)
---
 Dockerfile | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4dd4a46..85fb0a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2020 Nordix Foundation.
+#  Copyright (C) 2020-2023 Nordix Foundation.
+#  Coptyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,9 +18,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM openjdk:17-jdk as jre-build
+FROM openjdk:17-jdk AS jre-build
 
-RUN $JAVA_HOME/bin/jlink \
+RUN "$JAVA_HOME"/bin/jlink \
 --verbose \
 --add-modules ALL-MODULE-PATH \
 --strip-debug \
@@ -40,25 +41,25 @@ COPY --from=jre-build /customjre $JAVA_HOME
 ARG JAR
 
 WORKDIR /opt/app/information-coordinator-service
-RUN mkdir -p /var/log/information-coordinator-service
-RUN mkdir -p /opt/app/information-coordinator-service/etc/cert/
-RUN mkdir -p /var/information-coordinator-service
+RUN mkdir -p /var/log/information-coordinator-service && \
+    mkdir -p /opt/app/information-coordinator-service/etc/cert/ && \
+    mkdir -p /var/information-coordinator-service/database
 
 EXPOSE 8083 8434
 
-ADD /config/application.yaml /opt/app/information-coordinator-service/config/application.yaml
-ADD target/${JAR} /opt/app/information-coordinator-service/information-coordinator-service.jar
-ADD /config/keystore.jks /opt/app/information-coordinator-service/etc/cert/keystore.jks
-ADD /config/truststore.jks /opt/app/information-coordinator-service/etc/cert/truststore.jks
+COPY /config/application.yaml /opt/app/information-coordinator-service/config/application.yaml
+COPY target/${JAR} /opt/app/information-coordinator-service/information-coordinator-service.jar
+COPY /config/keystore.jks /opt/app/information-coordinator-service/etc/cert/keystore.jks
+COPY /config/truststore.jks /opt/app/information-coordinator-service/etc/cert/truststore.jks
 
 ARG user=nonrtric
 ARG group=nonrtric
 
-RUN groupadd $user && \
-    useradd -r -g $group $user
-RUN chown -R $user:$group /opt/app/information-coordinator-service
-RUN chown -R $user:$group /var/log/information-coordinator-service
-RUN chown -R $user:$group /var/information-coordinator-service
+RUN groupadd "$user" && \
+    useradd -r -g "$group" "$user" && \
+    chown -R "$user":"$group" /opt/app/information-coordinator-service && \
+    chown -R "$user":"$group" /var/log/information-coordinator-service && \
+    chown -R "$user":"$group" /var/information-coordinator-service
 
 USER ${user}
 
-- 
2.16.6