[MOSIP-31575] Updated docker file.

build/debezium-fixer/Dockerfile

@@ -1,16 +1,27 @@
 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
 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}
+    && 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}
 WORKDIR /home/${container_user}
-ADD --chown=${container_user}:${container_user_group} docker-entrypoint.sh .
+
+USER ${container_user_uid}:${container_user_gid}
 
 CMD ["./docker-entrypoint.sh"]

build/es-kafka-connecter/kafka_connect_transforms/Dockerfile

@@ -4,3 +4,11 @@ RUN confluent-hub install --no-prompt confluentinc/kafka-connect-elasticsearch:1
 
 ADD ./target/kafka_connect_transforms-*.jar /usr/share/java/my_transforms
 ADD ./target/debezium-core-*.jar /usr/share/java/my_transforms
+
+#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}

build/reporting-init/debezium-init/Dockerfile

@@ -1,7 +1,32 @@
 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}
+
 RUN apk add curl bash vim
 
 ADD docker-entrypoint.sh /
+# ARGs
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+
+# Set working directory and permissions
+WORKDIR /home/${container_user}
+
+# Create user and group
+RUN addgroup -g ${container_user_gid} ${container_user_group} || true && \
+    adduser -D -u ${container_user_uid} -G ${container_user_group} ${container_user} || true && \
+    chown -R ${container_user}:${container_user} /home/${container_user}
+
+USER ${container_user}:${container_user_group}
+USER ${container_user_uid}:${container_user_gid}
 
 CMD ["/docker-entrypoint.sh"]

build/reporting-init/es-kafka-connect-init/Dockerfile

@@ -1,9 +1,29 @@
 FROM alpine
 
-RUN apk add curl bash vim
-
-RUN mkdir /connectors /kibana_saved_objects
+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}
 
 ADD docker-entrypoint.sh /
 
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+
+WORKDIR /home/${container_user}
+
+
+RUN apk add --no-cache curl bash vim \
+    && mkdir /connectors /kibana_saved_objects \
+    && adduser -D -u 1001 mosip \
+    && chown -R ${container_user}:${container_user} /home/${container_user}
+
+USER ${container_user_uid}:${container_user_gid}
+
 CMD ["/docker-entrypoint.sh"]

build/spark-docker/apache-spark-py.Dockerfile

@@ -14,6 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+#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}
 
 ARG base_img
 

build/spark-docker/bitnami.Dockerfile

@@ -1,21 +1,29 @@
 FROM bitnami/spark:3
 
-USER root
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+WORKDIR /home/${container_user}
 
-RUN mkdir /my_spark_jobs
-RUN mkdir /my_spark_logs
-RUN mkdir /my_spark_full_logs
-RUN mkdir /.ivy2
-RUN mkdir /.m2
-RUN mkdir /opt/bitnami/spark/.ivy2
-RUN chown 1001:1001 /my_spark_jobs
-RUN chown 1001:1001 /my_spark_logs
-RUN chown 1001:1001 /my_spark_full_logs
-RUN chown 1001:1001 /.ivy2
-RUN chown 1001:1001 /.m2
-RUN chown 1001:1001 /opt/bitnami/spark/.ivy2
+USER root
 
-RUN pip3 install elasticsearch
-RUN pip3 install pandas
+RUN mkdir /my_spark_jobs \
+&& mkdir /my_spark_logs \
+&& mkdir /my_spark_full_logs \
+&& mkdir /.ivy2 \
+&& mkdir /.m2 \
+&& mkdir /opt/bitnami/spark/.ivy2 \
+&& chown 1001:1001 /my_spark_jobs \
+&& chown 1001:1001 /my_spark_logs \
+&& chown 1001:1001 /my_spark_full_logs \
+&& chown 1001:1001 /.ivy2 \
+&& chown 1001:1001 /.m2 \
+&& chown 1001:1001 /opt/bitnami/spark/.ivy2 \
+&& chown -R ${container_user}:${container_user} /home/${container_user} \
+&& pip3 install elasticsearch \
+&& pip3 install pandas
 
 USER 1001
+
+USER ${container_user_uid}:${container_user_gid}