Skip to content

Commit 45f7f39

Browse files
committed
Update frontend env handling
1 parent 221ad55 commit 45f7f39

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ __pycache__
44
.cache
55
.dockerignore
66
.env
7+
.env.*
78
.envs
89
.git
910
.gitignore

.github/workflows/run-ci-cd.yaml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -299,19 +299,6 @@ jobs:
299299
push: true
300300
tags: owasp/nest:backend-staging
301301

302-
- name: Prepare frontend public environment
303-
run: |
304-
touch frontend/.env
305-
echo "NEXT_PUBLIC_API_URL=${{ secrets.VITE_API_URL }}" >> frontend/.env
306-
echo "NEXT_PUBLIC_CSRF_URL=${{ secrets.VITE_CSRF_URL }}" >> frontend/.env
307-
echo "NEXT_PUBLIC_ENVIRONMENT=${{ secrets.VITE_ENVIRONMENT }}" >> frontend/.env
308-
echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> frontend/.env
309-
echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> frontend/.env
310-
echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> frontend/.env
311-
echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> frontend/.env
312-
echo "NEXT_PUBLIC_RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> frontend/.env
313-
echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> frontend/.env
314-
315302
- name: Get backend image size
316303
id: backend-size
317304
run: |
@@ -444,6 +431,19 @@ jobs:
444431
445432
# Frontend
446433
touch .env.frontend
434+
435+
# Public.
436+
echo "NEXT_PUBLIC_API_URL=${{ secrets.VITE_API_URL }}" >> .env.frontend
437+
echo "NEXT_PUBLIC_CSRF_URL=${{ secrets.VITE_CSRF_URL }}" >> .env.frontend
438+
echo "NEXT_PUBLIC_ENVIRONMENT=${{ secrets.VITE_ENVIRONMENT }}" >> .env.frontend
439+
echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> .env.frontend
440+
echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> .env.frontend
441+
echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> .env.frontend
442+
echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> .env.frontend
443+
echo "NEXT_PUBLIC_RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> .env.frontend
444+
echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> .env.frontend
445+
446+
# Private.
447447
echo "NEXT_SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env.frontend
448448
echo "NEXT_SERVER_CSRF_URL=${{ secrets.NEXT_SERVER_CSRF_URL }}" >> .env.frontend
449449
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.NEST_GITHUB_CLIENT_ID }}" >> .env.frontend
@@ -567,19 +567,6 @@ jobs:
567567
DISPLAY_SIZE=$(numfmt --to=iec --suffix=B "$RAW_SIZE")
568568
echo "human_readable=$DISPLAY_SIZE" >> $GITHUB_OUTPUT
569569
570-
- name: Prepare frontend public environment
571-
run: |
572-
touch frontend/.env
573-
echo "NEXT_PUBLIC_API_URL=${{ secrets.VITE_API_URL }}" >> frontend/.env
574-
echo "NEXT_PUBLIC_CSRF_URL=${{ secrets.VITE_CSRF_URL }}" >> frontend/.env
575-
echo "NEXT_PUBLIC_ENVIRONMENT=${{ secrets.VITE_ENVIRONMENT }}" >> frontend/.env
576-
echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> frontend/.env
577-
echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> frontend/.env
578-
echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> frontend/.env
579-
echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> frontend/.env
580-
echo "NEXT_PUBLIC_RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> frontend/.env
581-
echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> frontend/.env
582-
583570
- name: Build frontend image
584571
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
585572
with:
@@ -710,6 +697,19 @@ jobs:
710697
711698
# Frontend
712699
touch .env.frontend
700+
701+
# Public.
702+
echo "NEXT_PUBLIC_API_URL=${{ secrets.VITE_API_URL }}" >> .env.frontend
703+
echo "NEXT_PUBLIC_CSRF_URL=${{ secrets.VITE_CSRF_URL }}" >> .env.frontend
704+
echo "NEXT_PUBLIC_ENVIRONMENT=${{ secrets.VITE_ENVIRONMENT }}" >> .env.frontend
705+
echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> .env.frontend
706+
echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> .env.frontend
707+
echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> .env.frontend
708+
echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> .env.frontend
709+
echo "NEXT_PUBLIC_RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> .env.frontend
710+
echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> .env.frontend
711+
712+
# Private.
713713
echo "NEXT_SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env.frontend
714714
echo "NEXT_SERVER_CSRF_URL=${{ secrets.NEXT_SERVER_CSRF_URL }}" >> .env.frontend
715715
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.NEST_GITHUB_CLIENT_ID }}" >> .env.frontend

frontend/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COPY --chmod=444 package.json pnpm-lock.yaml ./
2727
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
2828
pnpm install --frozen-lockfile --ignore-scripts
2929

30-
COPY --chmod=444 .env .pnpmrc next.config.ts postcss.config.js tailwind.config.js tsconfig.json ./
30+
COPY --chmod=444 .pnpmrc next.config.ts postcss.config.js tailwind.config.js tsconfig.json ./
3131
COPY --chmod=555 public public
3232
COPY --chmod=555 src src
3333

frontend/next.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ export default withSentryConfig(nextConfig, {
5050
disable: false,
5151
ignore: ['**/node_modules/**'],
5252
},
53+
telemetry: false,
5354
widenClientFileUpload: true,
5455
})

0 commit comments

Comments
 (0)