From 2544adc76a3e1912da8a23124d3bced645a45d38 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:43:18 +0530
Subject: [PATCH 01/22] [MOSIP-31575] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/debezium-fixer/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/debezium-fixer/Dockerfile b/build/debezium-fixer/Dockerfile
index a5d4d8b..a491668 100644
--- a/build/debezium-fixer/Dockerfile
+++ b/build/debezium-fixer/Dockerfile
@@ -5,12 +5,15 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-RUN apk add curl bash vim jq \
-&& addgroup -g ${container_user_gid} ${container_user_group} \
-&& adduser -u ${container_user_uid} -G ${container_user_group} -s /bin/sh -D ${container_user}
-
 USER ${container_user}
 WORKDIR /home/${container_user}
 ADD --chown=${container_user}:${container_user_group} docker-entrypoint.sh .
 
+RUN apk add curl bash vim jq \
+&& addgroup -g ${container_user_gid} ${container_user_group} \
+&& adduser -u ${container_user_uid} -G ${container_user_group} -s /bin/sh -D ${container_user} \
+&& chown -R ${container_user}:${container_user} /home/${container_user}
+
+USER ${container_user_uid}:${container_user_gid}
+
 CMD ["./docker-entrypoint.sh"]

From d18f0da8c5a654bd82544c6eb10e7768f29d98df Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:46:09 +0530
Subject: [PATCH 02/22] [MOSIP-31575] Updated docker file.

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 .../kafka_connect_transforms/Dockerfile              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile b/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
index 57096bb..32e249a 100644
--- a/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
+++ b/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
@@ -1,6 +1,16 @@
 FROM confluentinc/cp-kafka-connect:7.0.0-1-ubi8
 
-RUN confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:11.1.3
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+
+WORKDIR /home/${container_user}
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} \
+&& confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:11.1.3
 
 ADD ./target/kafka_connect_transforms-*.jar /usr/share/java/my_transforms
 ADD ./target/debezium-core-*.jar /usr/share/java/my_transforms
+
+USER ${container_user_uid}:${container_user_gid}

From 70bc13156279cfc51ca8a29d7dd6ca0d15d80dfd Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:47:30 +0530
Subject: [PATCH 03/22] [MOSIP-31575] Updated docker file.

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index b109811..516479c 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -1,7 +1,17 @@
 FROM alpine
 
-RUN apk add curl bash vim
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+
+WORKDIR /home/${container_user}
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} \
+&& apk add curl bash vim
 
 ADD docker-entrypoint.sh /
 
+USER ${container_user_uid}:${container_user_gid}
+
 CMD ["/docker-entrypoint.sh"]

From 1629376febedbfdc6a3607df48e4fac0b0635384 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:49:22 +0530
Subject: [PATCH 04/22] [MOSIP-31575] Updated docker file.

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 .../reporting-init/es-kafka-connect-init/Dockerfile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/es-kafka-connect-init/Dockerfile b/build/reporting-init/es-kafka-connect-init/Dockerfile
index c225f5f..00b7d06 100644
--- a/build/reporting-init/es-kafka-connect-init/Dockerfile
+++ b/build/reporting-init/es-kafka-connect-init/Dockerfile
@@ -1,8 +1,17 @@
 FROM alpine
 
-RUN apk add curl bash vim
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
 
-RUN mkdir /connectors /kibana_saved_objects
+WORKDIR /home/${container_user}
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} \
+&& apk add curl bash vim \
+&& mkdir /connectors /kibana_saved_objects
+
+USER ${container_user_uid}:${container_user_gid}
 
 ADD docker-entrypoint.sh /
 

From d8b0b78ed0a3e3b3e7432992706bd4bf3a0a9567 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:52:09 +0530
Subject: [PATCH 05/22] Update push-trigger.yml

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 .github/workflows/push-trigger.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 171132f..66e3601 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -80,7 +80,7 @@ jobs:
             BUILD_ARTIFACT: 'es-kafka-connect'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: abhishek8shankar/kattu/.github/workflows/docker-build.yml@develop
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -99,7 +99,7 @@ jobs:
             SERVICE_NAME: 'debezium-fixer'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: abhishek8shankar/kattu/.github/workflows/docker-build.yml@develop
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -117,7 +117,7 @@ jobs:
             SERVICE_NAME: 'debezium-init'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: abhishek8shankar/kattu/.github/workflows/docker-build.yml@develop
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -135,7 +135,7 @@ jobs:
             SERVICE_NAME: 'es-kafka-connect-init'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: abhishek8shankar/kattu/.github/workflows/docker-build.yml@develop
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}

From 6bb8ca95e5f273f6a2f8aab0d5ca498de4419e26 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Sun, 31 Mar 2024 17:44:12 +0530
Subject: [PATCH 06/22] Update apache-spark-py.Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/spark-docker/apache-spark-py.Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/spark-docker/apache-spark-py.Dockerfile b/build/spark-docker/apache-spark-py.Dockerfile
index c4c982d..9ab4cf3 100644
--- a/build/spark-docker/apache-spark-py.Dockerfile
+++ b/build/spark-docker/apache-spark-py.Dockerfile
@@ -49,6 +49,14 @@ RUN mkdir ${spark_jobs_folder} && \
     chown ${spark_uid}:${spark_uid} ${spark_jobs_folder} && \
     chown ${spark_uid}:${spark_uid} /opt/spark/.ivy2
 
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+WORKDIR /home/${container_user}
+RUN chown -R ${container_user}:${container_user} /home/${container_user}
+USER ${container_user_uid}:${container_user_gid}
+
 USER ${spark_uid}
 
 RUN echo "print(\"JustForPrereq\")" > /tmp/prereq.py; \

From 7d6c132bc944d235b8eea0a5fca703bef3c93155 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Sun, 31 Mar 2024 17:45:17 +0530
Subject: [PATCH 07/22] Update bitnami.Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/spark-docker/bitnami.Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build/spark-docker/bitnami.Dockerfile b/build/spark-docker/bitnami.Dockerfile
index 199d548..59cc97a 100644
--- a/build/spark-docker/bitnami.Dockerfile
+++ b/build/spark-docker/bitnami.Dockerfile
@@ -17,5 +17,12 @@ RUN chown 1001:1001 /opt/bitnami/spark/.ivy2
 
 RUN pip3 install elasticsearch
 RUN pip3 install pandas
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+WORKDIR /home/${container_user}
+RUN chown -R ${container_user}:${container_user} /home/${container_user}
+USER ${container_user_uid}:${container_user_gid}
 
 USER 1001

From 3ec9247919d90ae7f7d496e66156d32cb103c58a Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:37:05 +0530
Subject: [PATCH 08/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/debezium-fixer/Dockerfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/debezium-fixer/Dockerfile b/build/debezium-fixer/Dockerfile
index a491668..b239d22 100644
--- a/build/debezium-fixer/Dockerfile
+++ b/build/debezium-fixer/Dockerfile
@@ -1,5 +1,14 @@
 FROM alpine:3.15.4
 
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
 ARG container_user=mosip
 ARG container_user_group=mosip
 ARG container_user_uid=1001

From 3ca48bd6d7dd834d4fa72d1b9b9487e0ca14e6ac Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:37:31 +0530
Subject: [PATCH 09/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index 516479c..1b63386 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -1,5 +1,14 @@
 FROM alpine
 
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
 ARG container_user=mosip
 ARG container_user_group=mosip
 ARG container_user_uid=1001

From ad8e1f89c8148ee3f085aa7fd8d0fa1956eb0964 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:38:57 +0530
Subject: [PATCH 10/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/es-kafka-connect-init/Dockerfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/reporting-init/es-kafka-connect-init/Dockerfile b/build/reporting-init/es-kafka-connect-init/Dockerfile
index 00b7d06..81b8d1d 100644
--- a/build/reporting-init/es-kafka-connect-init/Dockerfile
+++ b/build/reporting-init/es-kafka-connect-init/Dockerfile
@@ -1,5 +1,14 @@
 FROM alpine
 
+ARG SOURCE
+ARG COMMIT_HASH
+ARG COMMIT_ID
+ARG BUILD_TIME
+LABEL source=${SOURCE}
+LABEL commit_hash=${COMMIT_HASH}
+LABEL commit_id=${COMMIT_ID}
+LABEL build_time=${BUILD_TIME}
+
 ARG container_user=mosip
 ARG container_user_group=mosip
 ARG container_user_uid=1001

From 08117fe4f81a407dfff5fa3d58c361ce96ed13f6 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:42:11 +0530
Subject: [PATCH 11/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/debezium-fixer/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/debezium-fixer/Dockerfile b/build/debezium-fixer/Dockerfile
index b239d22..0c12a3a 100644
--- a/build/debezium-fixer/Dockerfile
+++ b/build/debezium-fixer/Dockerfile
@@ -14,8 +14,6 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-USER ${container_user}
-WORKDIR /home/${container_user}
 ADD --chown=${container_user}:${container_user_group} docker-entrypoint.sh .
 
 RUN apk add curl bash vim jq \
@@ -25,4 +23,7 @@ RUN apk add curl bash vim jq \
 
 USER ${container_user_uid}:${container_user_gid}
 
+USER ${container_user}
+WORKDIR /home/${container_user}
+
 CMD ["./docker-entrypoint.sh"]

From af4f834bbbff9924368759a83e7f83c9e1213022 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:45:04 +0530
Subject: [PATCH 12/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index 1b63386..b5e70f5 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -14,13 +14,13 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-WORKDIR /home/${container_user}
-
 RUN chown -R ${container_user}:${container_user} /home/${container_user} \
 && apk add curl bash vim
 
 ADD docker-entrypoint.sh /
 
+WORKDIR /home/${container_user}
+
 USER ${container_user_uid}:${container_user_gid}
 
 CMD ["/docker-entrypoint.sh"]

From c066c0f5b5363ec8ccd71b219ecfe9f2bc74099b Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:46:21 +0530
Subject: [PATCH 13/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/es-kafka-connect-init/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/es-kafka-connect-init/Dockerfile b/build/reporting-init/es-kafka-connect-init/Dockerfile
index 81b8d1d..a0040ad 100644
--- a/build/reporting-init/es-kafka-connect-init/Dockerfile
+++ b/build/reporting-init/es-kafka-connect-init/Dockerfile
@@ -14,8 +14,6 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-WORKDIR /home/${container_user}
-
 RUN chown -R ${container_user}:${container_user} /home/${container_user} \
 && apk add curl bash vim \
 && mkdir /connectors /kibana_saved_objects
@@ -24,4 +22,6 @@ USER ${container_user_uid}:${container_user_gid}
 
 ADD docker-entrypoint.sh /
 
+WORKDIR /home/${container_user}
+
 CMD ["/docker-entrypoint.sh"]

From feafdc216d44ce7362f319b750ac552c0b2f7672 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:48:22 +0530
Subject: [PATCH 14/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/es-kafka-connect-init/Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/reporting-init/es-kafka-connect-init/Dockerfile b/build/reporting-init/es-kafka-connect-init/Dockerfile
index a0040ad..7c15f73 100644
--- a/build/reporting-init/es-kafka-connect-init/Dockerfile
+++ b/build/reporting-init/es-kafka-connect-init/Dockerfile
@@ -14,14 +14,16 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-RUN chown -R ${container_user}:${container_user} /home/${container_user} \
-&& apk add curl bash vim \
-&& mkdir /connectors /kibana_saved_objects
 
-USER ${container_user_uid}:${container_user_gid}
+RUN apk add curl bash vim \
+&& mkdir /connectors /kibana_saved_objects
 
 ADD docker-entrypoint.sh /
 
 WORKDIR /home/${container_user}
 
+USER ${container_user_uid}:${container_user_gid}
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
 CMD ["/docker-entrypoint.sh"]

From a6ddde843300374df42b6fc234eab4bfeb1b5bf1 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:50:46 +0530
Subject: [PATCH 15/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 .../kafka_connect_transforms/Dockerfile                  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile b/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
index 32e249a..0b62c28 100644
--- a/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
+++ b/build/es-kafka-connecter/kafka_connect_transforms/Dockerfile
@@ -5,12 +5,13 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-WORKDIR /home/${container_user}
-
-RUN chown -R ${container_user}:${container_user} /home/${container_user} \
-&& confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:11.1.3
+RUN confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:11.1.3
 
 ADD ./target/kafka_connect_transforms-*.jar /usr/share/java/my_transforms
 ADD ./target/debezium-core-*.jar /usr/share/java/my_transforms
 
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
+WORKDIR /home/${container_user}
+
 USER ${container_user_uid}:${container_user_gid}

From 8261be8b32fa95c4c5c83a0009099a91f382ae11 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:51:29 +0530
Subject: [PATCH 16/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index b5e70f5..3bcf57d 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -14,13 +14,14 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
-RUN chown -R ${container_user}:${container_user} /home/${container_user} \
-&& apk add curl bash vim
+RUN apk add curl bash vim
 
 ADD docker-entrypoint.sh /
 
 WORKDIR /home/${container_user}
 
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
 USER ${container_user_uid}:${container_user_gid}
 
 CMD ["/docker-entrypoint.sh"]

From 4ab85df11ef5231130b192f34aa6071b925b569f Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:53:42 +0530
Subject: [PATCH 17/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index 3bcf57d..6856d8c 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -20,8 +20,8 @@ ADD docker-entrypoint.sh /
 
 WORKDIR /home/${container_user}
 
-RUN chown -R ${container_user}:${container_user} /home/${container_user} 
-
 USER ${container_user_uid}:${container_user_gid}
 
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
 CMD ["/docker-entrypoint.sh"]

From 0c4326f2a0a91f049dce370d384cdae6ac9766ac Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:54:32 +0530
Subject: [PATCH 18/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>

From 8044bd973c5b7ea8da5204c0a91f081e67209869 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:58:12 +0530
Subject: [PATCH 19/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index 6856d8c..ee5610f 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -18,10 +18,10 @@ RUN apk add curl bash vim
 
 ADD docker-entrypoint.sh /
 
-WORKDIR /home/${container_user}
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
 
 USER ${container_user_uid}:${container_user_gid}
 
-RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+WORKDIR /home/${container_user}
 
 CMD ["/docker-entrypoint.sh"]

From 5d089c2255ca875902dca6400ad7ff7eac1fd443 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:59:59 +0530
Subject: [PATCH 20/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index ee5610f..cbfedb8 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -16,12 +16,12 @@ ARG container_user_gid=1001
 
 RUN apk add curl bash vim
 
-ADD docker-entrypoint.sh /
-
 RUN chown -R ${container_user}:${container_user} /home/${container_user} 
 
 USER ${container_user_uid}:${container_user_gid}
 
 WORKDIR /home/${container_user}
 
+ADD docker-entrypoint.sh /
+
 CMD ["/docker-entrypoint.sh"]

From fa58944c5c4621ef3ae526bfb3167fe94ef30397 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:04:26 +0530
Subject: [PATCH 21/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/es-kafka-connect-init/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build/reporting-init/es-kafka-connect-init/Dockerfile b/build/reporting-init/es-kafka-connect-init/Dockerfile
index 7c15f73..211bfc0 100644
--- a/build/reporting-init/es-kafka-connect-init/Dockerfile
+++ b/build/reporting-init/es-kafka-connect-init/Dockerfile
@@ -14,16 +14,15 @@ ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
 
+ADD docker-entrypoint.sh /
 
 RUN apk add curl bash vim \
 && mkdir /connectors /kibana_saved_objects
 
-ADD docker-entrypoint.sh /
-
-WORKDIR /home/${container_user}
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
 
 USER ${container_user_uid}:${container_user_gid}
 
-RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+WORKDIR /home/${container_user}
 
 CMD ["/docker-entrypoint.sh"]

From 5eb21aaf331b1c61b3229dab3f10f399e21d636d Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:04:57 +0530
Subject: [PATCH 22/22] Update Dockerfile

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 build/reporting-init/debezium-init/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/reporting-init/debezium-init/Dockerfile b/build/reporting-init/debezium-init/Dockerfile
index cbfedb8..f487a79 100644
--- a/build/reporting-init/debezium-init/Dockerfile
+++ b/build/reporting-init/debezium-init/Dockerfile
@@ -13,7 +13,7 @@ ARG container_user=mosip
 ARG container_user_group=mosip
 ARG container_user_uid=1001
 ARG container_user_gid=1001
-
+ADD docker-entrypoint.sh /
 RUN apk add curl bash vim
 
 RUN chown -R ${container_user}:${container_user} /home/${container_user} 
@@ -22,6 +22,4 @@ USER ${container_user_uid}:${container_user_gid}
 
 WORKDIR /home/${container_user}
 
-ADD docker-entrypoint.sh /
-
 CMD ["/docker-entrypoint.sh"]