From cb893cdd65e272eff08926d70ce6076055bfa487 Mon Sep 17 00:00:00 2001
From: Akash Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:03:18 +0530
Subject: [PATCH] fix(CI): Optimize Server Docker Image Layers (#14835)

---
 docker/development/Dockerfile               | 13 ++++++-------
 docker/docker-compose-quickstart/Dockerfile | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 7feb282e1bbc..7cae4e2b8f9b 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -23,15 +23,14 @@ FROM alpine:3.18
 
 EXPOSE 8585
 
-RUN apk add --update --no-cache bash openjdk17-jre
+RUN adduser -D openmetadata && \
+    apk update && \
+    apk upgrade && \
+    apk add --update --no-cache bash openjdk17-jre
 
-COPY --from=build /opt/openmetadata /opt/openmetadata
-COPY docker/openmetadata-start.sh /
+COPY --chown=openmetadata:openmetadata --from=build /opt/openmetadata /opt/openmetadata
+COPY --chmod=755 docker/openmetadata-start.sh /
 
-RUN chmod 777 openmetadata-start.sh
-
-RUN adduser -D openmetadata
-RUN chown -R openmetadata:openmetadata /opt/openmetadata
 USER openmetadata
 
 WORKDIR /opt/openmetadata
diff --git a/docker/docker-compose-quickstart/Dockerfile b/docker/docker-compose-quickstart/Dockerfile
index 030937071673..19d8343326c9 100644
--- a/docker/docker-compose-quickstart/Dockerfile
+++ b/docker/docker-compose-quickstart/Dockerfile
@@ -35,13 +35,13 @@ LABEL org.open-metadata.build-date=$BUILD_DATE
 LABEL org.open-metadata.commit-id=$COMMIT_ID
 
 EXPOSE 8585 8586
-COPY docker/openmetadata-start.sh ./
-COPY --from=build /opt/openmetadata /opt/openmetadata
-RUN apk add --update --no-cache bash openjdk17-jre && \
+RUN adduser -D openmetadata && apk update && \
+    apk upgrade && \
+    apk add --update --no-cache bash openjdk17-jre && \
     chmod 777 openmetadata-start.sh
 
-RUN adduser -D openmetadata
-RUN chown -R openmetadata:openmetadata /opt/openmetadata
+COPY --chmod=755 docker/openmetadata-start.sh ./
+COPY --chown=openmetadata:openmetadata --from=build /opt/openmetadata /opt/openmetadata
 USER openmetadata
 
 WORKDIR /opt/openmetadata