Merge pull request #821 from bhumi46/develop

[DSD-5795] updated docker file to copy Biometrics and app prop as well as reduced docker layers for run commands

apitest/Dockerfile

@@ -23,36 +23,36 @@ ARG container_user_gid=1001
 
 ARG KUBECTL_VERSION=1.22.9
 
-# install packages and create user
-RUN apt-get -y update \
-&& apt-get install -y unzip jq \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
-&& curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
-&& chmod +x kubectl \
-&& mv kubectl /usr/local/bin/
-
 # set working directory for the user
 WORKDIR /home/${container_user}
 
 ENV work_dir=/home/${container_user}
 
-ADD ./apitest/target/ $work_dir
-
-ADD entrypoint.sh $work_dir/entrypoint.sh
-
-RUN chmod +x $work_dir/entrypoint.sh
-
-#ADD ./testNgXmlFiles/ $work_dir/testNgXmlFiles/
-
-# change permissions of file inside working dir
-RUN chown -R ${container_user}:${container_user} /home/${container_user} /usr/local/openjdk-11/lib/security/cacerts
-
-RUN chmod 644 /usr/local/openjdk-11/lib/security/cacerts
-
-# select container user for all tasks
+# Combine all necessary files into a single COPY command
+COPY ./apitest/target $work_dir/
+COPY application.properties $work_dir/
+COPY ["Biometric Devices", "$work_dir/Biometric Devices"]
+COPY ["resource", "$work_dir/resource"]
+COPY entrypoint.sh $work_dir
+
+# Combine all RUN commands into a single layer
+RUN apt-get -y update && \
+    apt-get install -y unzip jq && \
+    groupadd -g ${container_user_gid} ${container_user_group} && \
+    useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} && \
+    curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
+    chmod +x kubectl && \
+    mv kubectl /usr/local/bin/ && \
+    chown -R ${container_user}:${container_user} /home/${container_user} /usr/local/openjdk-11/lib/security/cacerts && \
+    chmod 644 /usr/local/openjdk-11/lib/security/cacerts && \
+    chmod +x $work_dir/entrypoint.sh
+
+
+#select container user for all tasks
 USER ${container_user_uid}:${container_user_gid}
 
+WORKDIR ${work_dir}
+
 EXPOSE 8083
 
 ENV MODULES=