Skip to content

Commit 7a735ab

Browse files
Merge pull request #2814 from devtron-labs/release-candidate-v0.39.0
feat: release candidate v0.39.0
2 parents eeb574a + cd59a39 commit 7a735ab

File tree

178 files changed

+20726
-13470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+20726
-13470
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ FEATURE_ASK_DEVTRON_EXPERT=false
7373
FEATURE_MANAGE_TRAFFIC_ENABLE=false
7474
FEATURE_REDFISH_NODE_ENABLE=false
7575
FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
76+
FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
77+
FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ src/components/ciPipeline/ConfigureWebhook.tsx
189189
src/components/ciPipeline/ExternalCIPipeline.tsx
190190
src/components/ciPipeline/LinkedCIPipelineEdit.tsx
191191
src/components/ciPipeline/LinkedCIPipelineView.tsx
192-
src/components/ciPipeline/SourceMaterials.tsx
193192
src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
194193
src/components/ciPipeline/Webhook/webhook.service.ts
195194
src/components/ciPipeline/Webhook/webhook.utils.ts
@@ -239,7 +238,6 @@ src/components/common/hooks/__tests__/FileReader.test.tsx
239238
src/components/common/icons/Icons.tsx
240239
src/components/common/lineChart/lineChart.tsx
241240
src/components/common/navigation/Navigation.tsx
242-
src/components/common/navigation/NavigationRoutes.tsx
243241
src/components/dockerRegistry/Docker.tsx
244242
src/components/dockerRegistry/ManageRegistry.tsx
245243
src/components/dockerRegistry/service.tsx

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: 'yarn'
2626

2727
- name: Install dependencies
28-
run: yarn install --frozen-lockfile
28+
run: yarn install --immutable
2929

3030
- name: Check linting issues
3131
run: yarn lint

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.11.0
1+
v22

.yarn/releases/yarn-4.9.2.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-4.9.2.cjs

Dockerfile

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,48 @@
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

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

19-
RUN echo "" >> .env && \
20-
echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env
23+
FROM fholzer/nginx-brotli:v1.26.2
2124

22-
RUN yarn build
25+
# Install bash
26+
RUN apk add --no-cache bash shadow
2327

24-
FROM nginx:stable
28+
RUN useradd -m -s /bin/bash devtron
2529

26-
RUN useradd -ms /bin/bash devtron
2730
COPY --from=builder /app/dist/ /usr/share/nginx/html
2831
COPY ./nginx.conf /etc/nginx/nginx.conf
2932
COPY ./nginx-default.conf /etc/nginx/conf.d/default.conf
33+
3034
WORKDIR /usr/share/nginx/html
31-
COPY --from=builder /app/./env.sh .
32-
COPY --from=builder /app/.env .
33-
COPY --from=builder /app/health.html .
3435

35-
RUN chown -R devtron:devtron /usr/share/nginx/html
36-
# Make our shell script executable
37-
RUN chmod +x env.sh
36+
COPY --from=builder /app/env.sh .
37+
COPY --from=builder /app/.env .
38+
COPY --from=builder /app/health.html .
39+
40+
RUN chown -R devtron:devtron /usr/share/nginx/html && \
41+
chmod +x env.sh
42+
3843
USER devtron
39-
CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\""]
44+
45+
# Override the default ENTRYPOINT to allow shell scripting as fholzer/nginx-brotli has by-default entrypoint of nginx
46+
ENTRYPOINT ["/bin/bash", "-c"]
47+
48+
CMD ["./env.sh && nginx -g 'daemon off;'"]

config.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,7 @@
5050
| FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE | false | If enabled user can pass the manual gitops repo |
5151
| SENTRY_RELEASE_VERSION | | Sentry release Version |
5252
| LOGIN_PAGE_IMAGE | | Login page image url |
53+
| FEATURE_FLUX_DEPLOYMENTS_ENABLE | false | Enables flux cd deployment type for devtron apps and devtron charts |
54+
| FEATURE_LINK_EXTERNAL_FLUX_ENABLE | false | Enables external flux cd migration |
5355

5456
# DASHBOARD CONFIG SECRET

index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
display: flex;
3939
justify-content: center;
4040
align-items: center;
41+
/* cannot use --bg-primary here, so using rgb */
42+
background: rgb(30, 31, 40);
4143
"
4244
>
4345
<svg width="80" height="80" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">

nginx.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,10 @@ http {
2828
gzip_comp_level 6;
2929
gzip_static on;
3030

31+
brotli off;
32+
brotli_comp_level 6;
33+
brotli_static on; # enabling this will ensure to serve pre-compressed file only
34+
brotli_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
35+
3136
include /etc/nginx/conf.d/*.conf;
3237
}

0 commit comments

Comments
 (0)