Skip to content

Commit ff2ccca

Browse files
committed
env: set maptiler key at runtime instead of build time
1 parent 09d3383 commit ff2ccca

7 files changed

Lines changed: 8 additions & 7 deletions

File tree

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ NEXTAUTH_URL=123
77
NEXTAUTH_SECRET=123
88

99
# Maptile configuration
10-
NEXT_PUBLIC_MAPTILER_STYLE_KEY=123
10+
MAPTILER_STYLE_KEY=123
1111

1212
# SEO
1313
PREVENT_SEARCH_BOTS=false

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ You can also check the
1111

1212
## Unreleased
1313

14+
- Maintenance
15+
- Set Maptiler API key from environment variable at runtime, to avoid having
16+
to rebuild the application when the key is rotated
17+
1418
### 6.4.0 – 2026-03-13
1519

1620
- Maintenance

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ WORKDIR /usr/src/app
88
# --build-arg PREVENT_SEARCH_BOTS=<true/false> \
99
# --build-arg COMMIT=$(git rev-parse HEAD) \
1010
# --build-arg VECTOR_TILE_URL=<url of the vector service> \
11-
# --build-arg MAPTILER_STYLE_KEY=<maptiler style key> \
1211
# --build-arg ADFS_ID=<adfs client id> \
1312
# --build-arg ADFS_ISSUER=<adfs issuer> \
1413
# --build-arg ADFS_PROFILE_URL=<adfs profile url> \
@@ -19,7 +18,6 @@ WORKDIR /usr/src/app
1918
ARG PREVENT_SEARCH_BOTS
2019
ARG COMMIT
2120
ARG VECTOR_TILE_URL
22-
ARG MAPTILER_STYLE_KEY
2321
ARG ADFS_ID
2422
ARG ADFS_ISSUER
2523
ARG ADFS_PROFILE_URL
@@ -40,7 +38,6 @@ ENV PORT=3000
4038
ENV PREVENT_SEARCH_BOTS=$PREVENT_SEARCH_BOTS
4139
ENV NEXT_PUBLIC_COMMIT=$COMMIT
4240
ENV NEXT_PUBLIC_BASE_VECTOR_TILE_URL=$VECTOR_TILE_URL
43-
ENV NEXT_PUBLIC_MAPTILER_STYLE_KEY=$MAPTILER_STYLE_KEY
4441
ENV ADFS_ID=$ADFS_ID
4542
ENV ADFS_ISSUER=$ADFS_ISSUER
4643
ENV ADFS_PROFILE_URL=$ADFS_PROFILE_URL

app/.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ SPARQL_GEO_ENDPOINT=https://geo.ld.admin.ch/query
44
GRAPHQL_ENDPOINT=/api/graphql
55
WHITELISTED_DATA_SOURCES=["Prod", "Prod-uncached", "Int", "Int-uncached", "Test", "Test-uncached", "LINDASold-Prod", "LINDASold-Prod-uncached", "LINDASold-Int", "LINDASold-Int-uncached", "LINDASold-Test", "LINDASold-Test-uncached"]
66
NEXT_PUBLIC_VECTOR_TILE_URL=https://world.vectortiles.geo.admin.ch
7-
NEXT_PUBLIC_MAPTILER_STYLE_KEY=123
7+
MAPTILER_STYLE_KEY=123
88
ADFS_PROFILE_URL=https://www.myaccount-r.eiam.admin.ch/
99
NEXTAUTH_URL=https://localhost:3000

app/domain/env.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ export const BUILD_GITHUB_REPO = (
6767
export const BASE_VECTOR_TILE_URL =
6868
process.env.NEXT_PUBLIC_BASE_VECTOR_TILE_URL ?? "";
6969
export const MAPTILER_STYLE_KEY =
70-
process.env.NEXT_PUBLIC_MAPTILER_STYLE_KEY ?? "";
70+
clientEnv?.MAPTILER_STYLE_KEY ?? process.env.MAPTILER_STYLE_KEY ?? "";

app/pages/api/client-env.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export default async function clientEnvApi(
2424
PUBLIC_URL: process.env.PUBLIC_URL,
2525
GRAPHQL_ENDPOINT: process.env.GRAPHQL_ENDPOINT,
2626
ADFS_PROFILE_URL: process.env.ADFS_PROFILE_URL,
27+
MAPTILER_STYLE_KEY: process.env.MAPTILER_STYLE_KEY,
2728
})}`;
2829

2930
if (result) {

scripts/docker-build-push.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ docker build \
1919
--label "COMMIT=$CI_COMMIT_SHA" \
2020
--label "TAGS=$DOCKER_IMAGE_TAGS" \
2121
--build-arg COMMIT=$CI_COMMIT_SHA \
22-
--build-arg MAPTILER_STYLE_KEY=$MAPTILER_STYLE_KEY \
2322
--build-arg VECTOR_TILE_URL=$VECTOR_TILE_URL \
2423
--build-arg ADFS_ID=$ADFS_ID \
2524
--build-arg ADFS_ISSUER=$ADFS_ISSUER \

0 commit comments

Comments
 (0)