chore: update Dockerfile(s) & allow build on arm

Author: Elessar1802

.dockerignore

@@ -1,2 +1,8 @@
 node_modules/
 README.md
+.github
+.husky
+.lintstagedrc
+LICENSE
+.vscode/
+.prettierrc.js

.husky/pre-commit

@@ -17,5 +17,7 @@
 
 . "$(dirname "$0")/_/husky.sh"
 
-# TODO: add lint-staged
-pnpm -r lint
+# TODO: add lint-staged && use pnpm -r lint (not working due to eslint & its ignorefile)
+pnpm --filter web lint
+pnpm --filter @devtron-labs/devtron-fe-common-lib lint
+pnpm --filter @devtron-labs/devtron-fe-lib lint

Dockerfile.storybook

@@ -1,18 +1,19 @@
 FROM node:20-alpine AS builder
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
 
 WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
-
-RUN yarn install --network-timeout 600000
 
 COPY . .
 
-RUN yarn build-storybook
+RUN pnpm i --frozen-lockfile
+
+RUN pnpm --filter=web build-storybook
 
 FROM nginx:stable
 
-COPY --from=builder /app/storybook-static/ /usr/share/nginx/html
+COPY --from=builder /app/apps/web/storybook-static/ /usr/share/nginx/html
 WORKDIR /usr/share/nginx/html
 
 CMD ["/bin/bash", "-c", "nginx -g \"daemon off;\""]

Dockerfile renamed to Dockerfile.web

@@ -1,29 +1,28 @@
 FROM node:20-alpine AS builder
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
 
 WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
 
-RUN yarn install --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
-RUN yarn build
+
+RUN pnpm i --frozen-lockfile
+RUN pnpm run build:prod
 
 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
+
+COPY --from=builder /app/apps/web/dist/ /usr/share/nginx/html
+COPY --from=builder /app/apps/web/nginx.conf /etc/nginx/nginx.conf
+COPY --from=builder /app/apps/web/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/apps/web/./env.sh .
+COPY --from=builder  /app/apps/web/.env .
 COPY --from=builder  /app/health.html .
 
 RUN chown -R devtron:devtron /usr/share/nginx/html

apps/web/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentConfigCompare/utils.ts

@@ -292,7 +292,7 @@ export const getManifestRequestValues = (config: AppEnvDeploymentConfigDTO): { d
         null
 
     return {
-        data: _data ? YAMLStringify(_data) ?? '' : '',
+        data: _data ? (YAMLStringify(_data) ?? '') : '',
         chartRefId: getDraftConfigChartRefId(config),
     }
 }

apps/web/src/components/app/details/cIDetails/CISecurity.utils.tsx

@@ -40,7 +40,7 @@ export const useGetCISecurityDetails = ({
 
     const severityCount: SeverityCount = isSecurityScanV2Enabled
         ? getSeverityCountFromSummary(scanResultResponse?.result.imageScan.vulnerability?.summary.severities)
-        : executionDetailsResponse?.result.severityCount ?? { critical: 0, high: 0, medium: 0, low: 0, unknown: 0 }
+        : (executionDetailsResponse?.result.severityCount ?? { critical: 0, high: 0, medium: 0, low: 0, unknown: 0 })
 
     const totalCount = getTotalSeverityCount(severityCount)
 

apps/web/src/components/app/details/triggerView/PipelineConfigDiff/utils.tsx

@@ -105,7 +105,7 @@ export const parseCompareWithSearchParams =
 
 export const getPipelineDeploymentConfigFromPromiseSettled = (
     res: PromiseSettledResult<ResponseType<AppEnvDeploymentConfigDTO>>,
-) => (res.status === 'fulfilled' ? res.value?.result ?? null : null)
+) => (res.status === 'fulfilled' ? (res.value?.result ?? null) : null)
 
 export const getPipelineDeploymentConfigErrFromPromiseSettled = (
     res: PromiseSettledResult<ResponseType<AppEnvDeploymentConfigDTO>>,

apps/web/src/components/app/types.ts

@@ -27,7 +27,7 @@ import {
     ReleaseMode,
     HelmReleaseStatus,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { RouteComponentProps } from 'react-router'
+import { RouteComponentProps } from 'react-router-dom'
 import { AppEnvironment } from '../../services/service.types'
 import { DeploymentStatusDetailsBreakdownDataType, ErrorItem } from './details/appDetails/appDetails.type'
 import { GroupFilterType } from '../ApplicationGroup/AppGroup.types'

apps/web/vite.config.mts

@@ -29,7 +29,7 @@ import { VitePWA } from 'vite-plugin-pwa'
 import tsconfigPaths from 'vite-tsconfig-paths'
 
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`
-const TARGET_URL = 'https://preview.devtron.ai/'
+const TARGET_URL = 'https://devtron-ent-7.devtron.info/'
 
 function reactVirtualized(): PluginOption {
     return {
@@ -97,6 +97,13 @@ export default defineConfig(({ mode }) => {
         base: '/dashboard',
         preview: {
             port: 3000,
+            proxy: {
+                '/orchestrator': {
+                    target: TARGET_URL,
+                    changeOrigin: true,
+                },
+                '/grafana': TARGET_URL,
+            },
         },
         build: {
             rollupOptions: {

package.json

@@ -2,8 +2,10 @@
     "name": "devtron-frontend",
     "version": "1.0.0",
     "scripts": {
-        "build": "pnpm run -r build",
-        "lint": "pnpm run -r lint"
+        "prepare": "husky install",
+        "lint": "pnpm run -r lint",
+        "build:prod": "pnpm run -r build",
+        "build:libs": "pnpm filter './packages/**' build"
     },
 	"devDependencies": {
 		"husky": "^7.0.4"