Merge branch 'develop' of github.com:devtron-labs/dashboard into feature/create-cluster

Author: Elessar1802

.github/workflows/pr-issue-validator.yaml

@@ -1,4 +1,3 @@
-
 name: Validate Pull Request
 
 on:
@@ -141,4 +140,4 @@ jobs:
           gh pr edit $PRNUM --add-label "PR:Issue-verification-failed"
           gh pr edit $PRNUM --remove-label "PR:Ready-to-Review"
           exit 1
-        fi
+        fi

Dockerfile

@@ -1,38 +1,42 @@
 FROM node:20-alpine AS builder
 
-RUN apk add --no-cache git
-
 WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
 
+COPY package.json yarn.lock .
+
+RUN apk add --no-cache git
 RUN yarn install --frozen-lockfile --network-timeout 600000
 
-COPY src/ src
-COPY nginx.conf .
-COPY tsconfig.json .
-COPY vite.config.mts .
 COPY . .
 
-RUN echo `git rev-parse --short=9 HEAD` > health.html
+RUN echo `git rev-parse --short HEAD` > health.html && \
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
+    yarn build
 
-RUN echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)\n" >> .env
+FROM fholzer/nginx-brotli:v1.26.2
 
-RUN yarn build
+# Install bash
+RUN apk add --no-cache bash shadow
 
-FROM nginx:stable
+RUN useradd -m -s /bin/bash devtron
 
-RUN useradd -ms /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 .
 
-RUN chown -R devtron:devtron /usr/share/nginx/html
-# Make our shell script executable
-RUN chmod +x env.sh
+
+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
+
 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;'"]

nginx.conf

@@ -20,6 +20,7 @@ http {
     #tcp_nopush     on;
     keepalive_timeout  65;
 
+    # gzip compression
     gzip  on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
     gzip_vary on;
@@ -28,5 +29,11 @@ http {
     gzip_comp_level 6;
     gzip_static on;
 
+    # btrotli compression
+    brotli on;
+    brotli_comp_level 6;
+    brotli_static on;
+    brotli_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
+
     include /etc/nginx/conf.d/*.conf;
 }