Merge pull request #2802 from devtron-labs/fix-dockerfile-optimise

fix: dockerfile 2nd stages fixes

Author: AbhishekA1509

Dockerfile

@@ -22,17 +22,27 @@ RUN yarn build
 
 FROM fholzer/nginx-brotli:v1.26.2
 
-RUN useradd -ms /bin/bash devtron
+# Install bash
+RUN apk add --no-cache bash shadow
+
+RUN useradd -m -s /bin/bash devtron
+
 COPY --from=builder /app/dist/ /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./nginx-default.conf /etc/nginx/conf.d/default.conf
+
 WORKDIR /usr/share/nginx/html
-COPY --from=builder  /app/./env.sh .
-COPY --from=builder  /app/.env .
-COPY --from=builder  /app/health.html .
 
-# Make our shell script executable
+COPY --from=builder /app/env.sh .
+COPY --from=builder /app/.env .
+COPY --from=builder /app/health.html .
+
 RUN chown -R devtron:devtron /usr/share/nginx/html && \
-    chmod +x env.sh 
+    chmod +x env.sh
+
 USER devtron
-CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]
+
+# Override the default ENTRYPOINT to allow shell scripting as fholzer/nginx-brotli has by-default entrypoint of nginx
+ENTRYPOINT ["/bin/bash", "-c"]
+
+CMD ["./env.sh && nginx -g 'daemon off;'"]

src/components/common/navigation/NavigationRoutes.tsx

@@ -171,7 +171,7 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly<NavigationRoutesType
             const controls = animate(navBarWidth, NAVBAR_WIDTH, {
                 duration: 0.3,
                 ease: 'easeOut',
-                delay: 1,
+                delay: 0.6,
             })
             return controls.stop
         }