Merge branch 'release-candidate-v0.39.0' of github.com:devtron-labs/dashboard into feat/rb-table

Author: Elessar1802

Dockerfile

@@ -1,18 +1,17 @@
-FROM node:22-alpine AS builder
+FROM node:20-alpine AS builder
 
-WORKDIR /app
-
-RUN corepack enable yarn && \
-    yarn set version 4.9.2
+RUN apk add --no-cache git
 
+WORKDIR /app
 COPY package.json .
 COPY yarn.lock .
-COPY .yarn/ .yarn/
-COPY .yarnrc.yml ./
 
-RUN apk add --no-cache git
-RUN yarn install --immutable --network-timeout 600000
+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 && \
@@ -21,19 +20,29 @@ RUN echo `git rev-parse --short=9 HEAD` > health.html && \
 
 RUN yarn build
 
-FROM nginx:stable
+FROM fholzer/nginx-brotli:v1.26.2
+
+# Install bash
+RUN apk add --no-cache bash shadow
+
+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 .
 
-# 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;'"]

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-6",
+        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-7",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

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
         }

src/components/dockerRegistry/Docker.tsx

@@ -804,7 +804,8 @@ const DockerForm = ({
             ...(registryStorageType !== RegistryStorageType.OCI_PUBLIC &&
             (selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
                 selectedDockerRegistryType.value === RegistryType.ACR ||
-                selectedDockerRegistryType.value === RegistryType.QUAY)
+                selectedDockerRegistryType.value === RegistryType.QUAY ||
+                selectedDockerRegistryType.value === RegistryType.GITLAB)
                 ? {
                       username: trimmedUsername,
                       password: parsePassword(customState.password.value),
@@ -1014,6 +1015,7 @@ const DockerForm = ({
                 break
             case RegistryType.ACR:
             case RegistryType.QUAY:
+            case RegistryType.GITLAB:
             case RegistryType.OTHER:
                 let error = false
                 if (
@@ -1656,6 +1658,7 @@ const DockerForm = ({
                                 {(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
                                     selectedDockerRegistryType.value === RegistryType.ACR ||
                                     selectedDockerRegistryType.value === RegistryType.QUAY ||
+                                    selectedDockerRegistryType.value === RegistryType.GITLAB ||
                                     selectedDockerRegistryType.value === RegistryType.OTHER) && (
                                     <PasswordField
                                         shouldShowDefaultPlaceholderOnBlur={!!id && !!username}
@@ -1722,6 +1725,7 @@ const DockerForm = ({
                             {(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
                                 selectedDockerRegistryType.value === RegistryType.ACR ||
                                 selectedDockerRegistryType.value === RegistryType.QUAY ||
+                                selectedDockerRegistryType.value === RegistryType.GITLAB ||
                                 selectedDockerRegistryType.value === RegistryType.OTHER) && (
                                 <PasswordField
                                     shouldShowDefaultPlaceholderOnBlur={!!id}

src/config/constants.ts

@@ -481,6 +481,7 @@ export const RegistryType = {
     ECR: 'ecr',
     ARTIFACT_REGISTRY: 'artifact-registry',
     GCR: 'gcr',
+    GITLAB: 'gitlab',
 }
 
 export const RegistryTypeName = {

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-6":
-  version: 1.16.0-pre-6
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-6"
+"@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-7":
+  version: 1.16.0-pre-7
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-7"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1773,7 +1773,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/ad839d7b036e5d1e8fea2cd6733c2fc70090916b7cc7d2058c5302ab007a9f88cfedd8aafb5adb44cc9a0ea16a09801bbaabdbd8c68767c77bd6e0743a6791dd
+  checksum: 10c0/c76ae2146e8949d75a8ebf402117e362de6adec52950b08b89e811620646928cdaa73d1324600412a36d52d9d569ecb3a38991d25d29b26086e7b9ecd1981229
   languageName: node
   linkType: hard
 
@@ -5685,7 +5685,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.16.0-pre-6"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.16.0-pre-7"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"