Skip to content

Commit 4d7170d

Browse files
committed
Merge branch 'release-candidate-v0.39.0' of github.com:devtron-labs/dashboard into feat/rb-table
2 parents c4f94d2 + 2f2389b commit 4d7170d

File tree

5 files changed

+18
-19
lines changed

5 files changed

+18
-19
lines changed

Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
FROM node:20-alpine AS builder
2-
3-
RUN apk add --no-cache git
1+
FROM node:22-alpine AS builder
42

53
WORKDIR /app
4+
5+
RUN corepack enable yarn && \
6+
yarn set version 4.9.2
7+
68
COPY package.json .
79
COPY yarn.lock .
10+
COPY .yarn/ .yarn/
11+
COPY .yarnrc.yml ./
812

9-
RUN yarn install --frozen-lockfile --network-timeout 600000
13+
RUN apk add --no-cache git
14+
RUN yarn install --immutable --network-timeout 600000
1015

11-
COPY src/ src
12-
COPY nginx.conf .
13-
COPY tsconfig.json .
14-
COPY vite.config.mts .
1516
COPY . .
1617

1718
RUN echo `git rev-parse --short=9 HEAD` > health.html && \
1819
echo "" >> .env && \
19-
echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env
20-
21-
RUN yarn build
20+
echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env && \
21+
yarn build
2222

2323
FROM fholzer/nginx-brotli:v1.26.2
2424

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-7",
7+
"@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-9",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/Pages/App/CreateAppModal/ProjectSelector.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: Pr
6161
onChange={handleChange}
6262
error={error}
6363
autoFocus
64-
defaultMenuIsOpen
6564
/>
6665
</div>
6766
)

src/components/common/navigation/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const COMMON_ENV_FALLBACK: Omit<EnvironmentDataValuesDTO, 'isAirGapEnvironment'>
3030
featureGitOpsFlags: structuredClone(DEFAULT_GIT_OPS_FEATURE_FLAGS),
3131
canFetchHelmAppStatus: false,
3232
devtronManagedLicensingEnabled: false,
33-
isResourceRecommendationEnabled: true,
33+
isResourceRecommendationEnabled: false,
3434
}
3535

3636
export const ENVIRONMENT_DATA_FALLBACK: EnvironmentDataValuesDTO = {

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,9 +1722,9 @@ __metadata:
17221722
languageName: node
17231723
linkType: hard
17241724

1725-
"@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-7":
1726-
version: 1.16.0-pre-7
1727-
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-7"
1725+
"@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-9":
1726+
version: 1.16.0-pre-9
1727+
resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-9"
17281728
dependencies:
17291729
"@codemirror/autocomplete": "npm:6.18.6"
17301730
"@codemirror/lang-json": "npm:6.0.1"
@@ -1773,7 +1773,7 @@ __metadata:
17731773
react-select: 5.8.0
17741774
rxjs: ^7.8.1
17751775
yaml: ^2.4.1
1776-
checksum: 10c0/c76ae2146e8949d75a8ebf402117e362de6adec52950b08b89e811620646928cdaa73d1324600412a36d52d9d569ecb3a38991d25d29b26086e7b9ecd1981229
1776+
checksum: 10c0/73687a79a34ca378d323f4e9d5092420d93184249f198ca048b3c512013d4dd5150234b9a88dba0d93091b6e1cc564956b6aab18598f4513aa594d33e6f14706
17771777
languageName: node
17781778
linkType: hard
17791779

@@ -5685,7 +5685,7 @@ __metadata:
56855685
version: 0.0.0-use.local
56865686
resolution: "dashboard@workspace:."
56875687
dependencies:
5688-
"@devtron-labs/devtron-fe-common-lib": "npm:1.16.0-pre-7"
5688+
"@devtron-labs/devtron-fe-common-lib": "npm:1.16.0-pre-9"
56895689
"@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
56905690
"@playwright/test": "npm:^1.32.1"
56915691
"@rjsf/core": "npm:^5.13.3"

0 commit comments

Comments
 (0)