diff --git a/.env.example b/.env.example index 76e1fb0e5..bf6f3b3e7 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ NEXT_PUBLIC_PLANNER_ORG_ID=atb # Specifies what environment to build locally (dev | staging | prod) NEXT_PUBLIC_ENVIRONMENT=staging +NEXT_PUBLIC_BUILD_ID=local NEXT_PUBLIC_MAPBOX_API_TOKEN= NEXT_PUBLIC_MAPBOX_STOP_PLACES_STYLE_URL= @@ -20,4 +21,4 @@ NEXT_PUBLIC_FIREBASE_APP_ID="1:939812594010:web:0308b2a9cdc80b0d069363" API_BASE_URL=https://atb-staging.api.mittatb.no ENTUR_BASE_URL=https://api.staging.entur.io -NEXT_PUBLIC_WS_API_BASE_URL=wss://atb-staging.api.mittatb.no \ No newline at end of file +NEXT_PUBLIC_WS_API_BASE_URL=wss://atb-staging.api.mittatb.no diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d703097c3..48289d12d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,7 @@ name: Docker Build, Push & Deploy on: + workflow_dispatch: release: types: [published] push: @@ -12,6 +13,7 @@ jobs: with: image: gcr.io/atb-mobility-platform/planner-web build_args: | + NEXT_PUBLIC_BUILD_ID=${{ github.sha }} ATB_NEXT_PUBLIC_MAPBOX_DEFAULT_LAT=63.43457 ATB_NEXT_PUBLIC_MAPBOX_DEFAULT_LNG=10.39844 ATB_NEXT_PUBLIC_FIREBASE_PROJECT_ID=${{ github.event_name == 'release' && 'atb-mobility-platform' || 'atb-mobility-platform-staging'}} diff --git a/Dockerfile b/Dockerfile index 326b5822b..8ccf0f1f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ COPY . . ENV NEXT_TELEMETRY_DISABLED 1 ARG NEXT_PUBLIC_ENVIRONMENT +ARG NEXT_PUBLIC_BUILD_ID ARG ATB_NEXT_PUBLIC_MAPBOX_DEFAULT_LAT ARG ATB_NEXT_PUBLIC_MAPBOX_DEFAULT_LNG @@ -90,6 +91,7 @@ RUN pnpm generate # Global build ENV NEXT_PUBLIC_ENVIRONMENT=$NEXT_PUBLIC_ENVIRONMENT +ENV NEXT_PUBLIC_BUILD_ID=$NEXT_PUBLIC_BUILD_ID # Build AtB ENV NEXT_PUBLIC_PLANNER_ORG_ID="atb" diff --git a/src/pages/dev/trip-pattern.module.css b/src/pages/dev/trip-pattern.module.css index 9ce466d9e..e352b4748 100644 --- a/src/pages/dev/trip-pattern.module.css +++ b/src/pages/dev/trip-pattern.module.css @@ -176,3 +176,12 @@ opacity: 0.6; cursor: not-allowed; } + +.buildInfo { + display: flex; + gap: 1rem; + padding: 1rem; + border-top: 1px solid var(--color-background-neutral-2-background, #e0e0e0); + font-family: ui-monospace, SFMono-Regular, Menlo, monospace; + font-size: 0.75rem; +} diff --git a/src/pages/dev/trip-pattern.tsx b/src/pages/dev/trip-pattern.tsx index 940c35a40..9b22118f3 100644 --- a/src/pages/dev/trip-pattern.tsx +++ b/src/pages/dev/trip-pattern.tsx @@ -441,6 +441,12 @@ const DevTripPatternPage: NextPage = (props) => { )} + ); };