Merge pull request #2791 from devtron-labs/fix-revert-brotli-hotfix

fix: revert brotli

Author: SATYAsasini

Dockerfile

@@ -1,43 +1,39 @@
 FROM node:20-alpine AS builder
 
-WORKDIR /app
+RUN apk add --no-cache git
 
-COPY package.json yarn.lock .
+WORKDIR /app
+COPY package.json .
+COPY 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 HEAD` > health.html && \
-    echo "" >> .env && \
-    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
-    yarn build
+RUN echo `git rev-parse --short=9 HEAD` > health.html
 
-FROM fholzer/nginx-brotli:v1.26.2
+RUN echo "" >> .env && \
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env
 
-# Install bash
-RUN apk add --no-cache bash shadow
+RUN yarn build
 
-RUN useradd -m -s /bin/bash devtron
+FROM nginx:stable
 
+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 .
 
-
-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
-
+RUN chown -R devtron:devtron /usr/share/nginx/html
+# Make our shell script executable
+RUN chmod +x env.sh
 USER devtron
-
-# 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;'"]
+CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]

nginx.conf

@@ -20,7 +20,6 @@ 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;
@@ -29,11 +28,5 @@ 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;
 }

vite.config.mts

@@ -186,7 +186,7 @@ export default defineConfig(({ mode }) => {
                 svgrOptions: {},
             }),
             compression({
-                algorithm: 'brotliCompress',
+                algorithm: 'gzip',
             }),
             reactVirtualized(),
             requireTransform(),