Develop

.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 }}

build/debezium-fixer/Dockerfile

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

build/es-kafka-connecter/kafka_connect_transforms/Dockerfile

@@ -1,6 +1,17 @@
 FROM confluentinc/cp-kafka-connect:7.0.0-1-ubi8
 
+ARG container_user=mosip
+ARG container_user_group=mosip
+ARG container_user_uid=1001
+ARG container_user_gid=1001
+
 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}

build/reporting-init/debezium-init/Dockerfile

@@ -1,7 +1,25 @@
 FROM alpine
 
-RUN apk add curl bash vim
+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
 ADD docker-entrypoint.sh /
+RUN apk add curl bash vim
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
+USER ${container_user_uid}:${container_user_gid}
+
+WORKDIR /home/${container_user}
 
 CMD ["/docker-entrypoint.sh"]

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

@@ -1,9 +1,28 @@
 FROM alpine
 
-RUN apk add curl bash vim
+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 mkdir /connectors /kibana_saved_objects
+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 \
+&& mkdir /connectors /kibana_saved_objects
+
+RUN chown -R ${container_user}:${container_user} /home/${container_user} 
+
+USER ${container_user_uid}:${container_user_gid}
+
+WORKDIR /home/${container_user}
+
 CMD ["/docker-entrypoint.sh"]

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; \

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