ci: lots of changes

Author: mrTuomoK

.env

@@ -0,0 +1,56 @@
+# Default environment variable keys for runtime injection (env.sh).
+# Values are overridden at container startup by OpenShift configMap / env vars.
+# Per-app values are set in deployment configuration.
+
+CMS_ORIGIN=
+FEDERATION_ROUTER_ENDPOINT=
+LINKEDEVENTS_EVENT_ENDPOINT=
+SKIP_BUILD_STATIC_GENERATION=1
+REVALIDATE_TOKEN=
+
+NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
+NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=
+NEXT_PUBLIC_DEBUG=false
+NEXT_PUBLIC_DEFAULT_ISR_REVALIDATE_SECONDS=60
+NEXT_PUBLIC_ALLOW_UNAUTHORIZED_REQUESTS=false
+
+NEXT_PUBLIC_SENTRY_PROJECT=
+NEXT_PUBLIC_SENTRY_DSN=
+NEXT_PUBLIC_SENTRY_ENVIRONMENT=
+NEXT_PUBLIC_SENTRY_RELEASE=
+NEXT_PUBLIC_SENTRY_TRACES_SAMPLE_RATE=0
+NEXT_PUBLIC_SENTRY_REPLAYS_SESSION_SAMPLE_RATE=0
+NEXT_PUBLIC_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE=0
+NEXT_PUBLIC_SENTRY_TRACE_PROPAGATION_TARGETS=
+
+NEXT_PUBLIC_CMS_HEADER_MENU_NAME_FI=
+NEXT_PUBLIC_CMS_HEADER_MENU_NAME_EN=
+NEXT_PUBLIC_CMS_HEADER_MENU_NAME_SV=
+NEXT_PUBLIC_CMS_HEADER_UNIVERSAL_BAR_MENU_NAME_FI=
+NEXT_PUBLIC_CMS_HEADER_UNIVERSAL_BAR_MENU_NAME_EN=
+NEXT_PUBLIC_CMS_HEADER_UNIVERSAL_BAR_MENU_NAME_SV=
+NEXT_PUBLIC_CMS_FOOTER_MENU_NAME_FI=
+NEXT_PUBLIC_CMS_FOOTER_MENU_NAME_EN=
+NEXT_PUBLIC_CMS_FOOTER_MENU_NAME_SV=
+NEXT_PUBLIC_CMS_ARTICLES_CONTEXT_PATH=/articles
+NEXT_PUBLIC_CMS_PAGES_CONTEXT_PATH=/pages
+
+NEXT_PUBLIC_MATOMO_URL_BASE=
+NEXT_PUBLIC_MATOMO_SITE_ID=
+NEXT_PUBLIC_MATOMO_SRC_URL=
+NEXT_PUBLIC_MATOMO_TRACKER_URL=
+NEXT_PUBLIC_MATOMO_ENABLED=false
+
+NEXT_PUBLIC_ASKEM_ENABLED=false
+NEXT_PUBLIC_ASKEM_API_KEY_FI=
+NEXT_PUBLIC_ASKEM_API_KEY_EN=
+NEXT_PUBLIC_ASKEM_API_KEY_SV=
+
+NEXT_PUBLIC_SHOW_SIMILAR_EVENTS=true
+NEXT_PUBLIC_SHOW_SIMILAR_VENUES=true
+NEXT_PUBLIC_SHOW_TARGET_GROUP_FILTER=false
+NEXT_PUBLIC_SHOW_VENUES_UPCOMING_EVENTS=true
+NEXT_PUBLIC_SHOW_ENROLMENT_STATUS_IN_CARD_DETAILS=false
+
+NEXT_PUBLIC_RELEASE=
+NEXT_PUBLIC_COMMITHASH=

Dockerfile

@@ -9,12 +9,10 @@
 ###################################################################
 ARG BUILDER_FROM_IMAGE=helsinki.azurecr.io/ubi10/nodejs-24-pnpm-builder-base
 
-FROM registry.access.redhat.com/ubi9/nodejs-24 AS deps
+FROM ${BUILDER_FROM_IMAGE} AS deps
 
 USER root
 
-RUN npm install -g pnpm@11.5.1
-
 # install rsync (to fetch cached files)
 RUN yum update -y && \
     yum install -y rsync
@@ -158,12 +156,10 @@ CMD ["sh", "-c", "echo ${PROJECT}"]
 # last stage should be the production build."                     #
 ###################################################################
 
-FROM registry.access.redhat.com/ubi9/nodejs-24  AS develop
+FROM ${BUILDER_FROM_IMAGE}  AS develop
 
 USER root
 
-RUN npm install -g pnpm@11.5.1
-
 # Use non-root user
 USER default
 
@@ -191,7 +187,7 @@ COPY --from=deps --chown=default:root /workspace-install ./
 
 RUN pnpm install --frozen-lockfile
 
-ENV PORT ${APP_PORT:-3000}
+ENV PORT ${APP_PORT:-8080}
 
 # Expose port
 EXPOSE $PORT
@@ -207,7 +203,7 @@ CMD ["sh", "-c", "${DEV_START}"]
 # Stage 3: Extract a minimal image from the build                 #
 ###################################################################
 
-FROM registry.access.redhat.com/ubi9/nodejs-24 AS runner
+FROM ${BUILDER_FROM_IMAGE} AS runner
 
 # Use non-root user
 USER default
@@ -247,9 +243,9 @@ RUN chgrp -R 0 /app/apps/${PROJECT}/.next/server/pages && chmod g+w -R /app/apps
 USER default
 
 ENV NEXT_TELEMETRY_DISABLED 1
-ENV PORT ${APP_PORT:-3000}
+ENV PORT ${APP_PORT:-8080}
 
-# Expose port
+# Expose port (OpenShift convention; mapped to host port 3000 in docker compose)
 EXPOSE $PORT
 
 USER root
@@ -258,8 +254,11 @@ USER root
 RUN yum update -y && \
     yum install -y diffutils
 
+COPY --chown=default:root .env /app/.env
+COPY --chown=default:root scripts/env.sh /app/scripts/env.sh
 COPY --chown=default:root run_node.sh /app/run_node.sh
-RUN chgrp 0 /app/run_node.sh && chmod +x /app/run_node.sh
+RUN chgrp 0 /app/run_node.sh /app/scripts/env.sh && \
+    chmod +x /app/run_node.sh /app/scripts/env.sh
 USER default
 
 # ENV PROD_START "./node_modules/.bin/next start apps/${PROJECT}/ -p ${PORT}"

DockerfileCache

@@ -8,10 +8,11 @@
 #      ignore: all **/node_modules folders and .yarn/cache        #
 ###################################################################
 
-FROM registry.access.redhat.com/ubi9/nodejs-24 AS deps
+ARG BUILDER_FROM_IMAGE=helsinki.azurecr.io/ubi10/nodejs-24-pnpm-builder-base
+
+FROM ${BUILDER_FROM_IMAGE} AS deps
 
 USER root
-RUN npm install -g pnpm@11.5.1
 
 # install rsync (to fetch cached files)
 RUN yum update -y && \
@@ -76,7 +77,7 @@ RUN yum remove -y rsync && \
 # This is used to speedup OpenShift builds                        #
 ###################################################################
 # Build cache layer
-FROM registry.access.redhat.com/ubi9/nodejs-24 AS build_cache
+FROM ${BUILDER_FROM_IMAGE} AS build_cache
 # Build ARGS
 ARG PROJECT
 ARG CMS_ORIGIN
@@ -126,14 +127,11 @@ WORKDIR /app
 COPY --chown=default:root  . .
 COPY --from=deps --chown=default:root /workspace-install ./
 
-USER root
-RUN npm install -g pnpm@11.5.1
-
 USER default
 
 RUN pnpm install --frozen-lockfile
 
-FROM registry.access.redhat.com/ubi9/nodejs-24 AS cache
+FROM ${BUILDER_FROM_IMAGE} AS cache
 ARG PROJECT
 
 WORKDIR /app/

apps/events-helsinki/sentry.edge.config.ts

@@ -1,26 +1,22 @@
+import { getSentryRuntimeConfig } from '@events-helsinki/components/sentry/runtimeConfig';
 import {
   beforeSend,
   beforeSendTransaction,
 } from '@events-helsinki/components/sentry/utils';
 import * as Sentry from '@sentry/nextjs';
 
-if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
+const sentryConfig = getSentryRuntimeConfig();
+
+if (sentryConfig.dsn) {
   Sentry.init({
-    dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-    environment: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
-    release: process.env.NEXT_PUBLIC_SENTRY_RELEASE,
-    // Adjust this value in production, or use tracesSampler for greater control
-    // @see https://develop.sentry.dev/sdk/performance/
-    // To turn it off, remove the line
-    // @see https://github.com/getsentry/sentry-javascript/discussions/4503#discussioncomment-2143116
-    tracesSampleRate: Number.parseFloat(
-      process.env.NEXT_PUBLIC_SENTRY_TRACES_SAMPLE_RATE || '0'
-    ),
+    dsn: sentryConfig.dsn,
+    environment: sentryConfig.environment,
+    release: sentryConfig.release,
+    tracesSampleRate: sentryConfig.tracesSampleRate,
     normalizeDepth: 3,
     integrations: [Sentry.extraErrorDataIntegration({ depth: 3 })],
     beforeSend,
     beforeSendTransaction,
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
     debug: false,
   });
 }

apps/events-helsinki/sentry.server.config.ts

@@ -1,26 +1,22 @@
+import { getSentryRuntimeConfig } from '@events-helsinki/components/sentry/runtimeConfig';
 import {
   beforeSend,
   beforeSendTransaction,
 } from '@events-helsinki/components/sentry/utils';
 import * as Sentry from '@sentry/nextjs';
 
-if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
+const sentryConfig = getSentryRuntimeConfig();
+
+if (sentryConfig.dsn) {
   Sentry.init({
-    dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-    environment: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
-    release: process.env.NEXT_PUBLIC_SENTRY_RELEASE,
-    // Adjust this value in production, or use tracesSampler for greater control
-    // @see https://develop.sentry.dev/sdk/performance/
-    // To turn it off, remove the line
-    // @see https://github.com/getsentry/sentry-javascript/discussions/4503#discussioncomment-2143116
-    tracesSampleRate: Number.parseFloat(
-      process.env.NEXT_PUBLIC_SENTRY_TRACES_SAMPLE_RATE || '0'
-    ),
+    dsn: sentryConfig.dsn,
+    environment: sentryConfig.environment,
+    release: sentryConfig.release,
+    tracesSampleRate: sentryConfig.tracesSampleRate,
     normalizeDepth: 3,
     integrations: [Sentry.extraErrorDataIntegration({ depth: 3 })],
     beforeSend,
     beforeSendTransaction,
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
     debug: false,
   });
 }

apps/events-helsinki/src/domain/app/AppConfig.ts

@@ -1,5 +1,6 @@
 import {
   getEnvOrError,
+  getRuntimeEnv,
   EventTypeId,
   ignoredErrorCodesHeader,
 } from '@events-helsinki/components';
@@ -24,7 +25,10 @@ class AppConfig {
    * inside the app.
    * */
   static get cmsOrigin() {
-    return getEnvOrError(publicRuntimeConfig.cmsOrigin, 'CMS_ORIGIN');
+    return getEnvOrError(
+      getRuntimeEnv('CMS_ORIGIN') ?? publicRuntimeConfig.cmsOrigin,
+      'CMS_ORIGIN'
+    );
   }
 
   /**
@@ -33,7 +37,8 @@ class AppConfig {
    * */
   static get federationGraphqlEndpoint() {
     return getEnvOrError(
-      publicRuntimeConfig.federationRouter,
+      getRuntimeEnv('FEDERATION_ROUTER_ENDPOINT') ??
+        publicRuntimeConfig.federationRouter,
       'FEDERATION_ROUTER_ENDPOINT'
     );
   }
@@ -49,7 +54,8 @@ class AppConfig {
    * */
   static get linkedEventsEventEndpoint() {
     return getEnvOrError(
-      publicRuntimeConfig.linkedEvents,
+      getRuntimeEnv('LINKEDEVENTS_EVENT_ENDPOINT') ??
+        publicRuntimeConfig.linkedEvents,
       'LINKEDEVENTS_EVENT_ENDPOINT'
     );
   }
@@ -60,7 +66,7 @@ class AppConfig {
    * */
   static get origin() {
     return getEnvOrError(
-      process.env.NEXT_PUBLIC_APP_ORIGIN,
+      getRuntimeEnv('NEXT_PUBLIC_APP_ORIGIN'),
       'NEXT_PUBLIC_APP_ORIGIN'
     );
   }
@@ -81,7 +87,9 @@ class AppConfig {
    * The application can then use a PostQuery to fetch the related information from an external service.
    */
   static get cmsArticlesContextPath() {
-    return process.env.NEXT_PUBLIC_CMS_ARTICLES_CONTEXT_PATH ?? '/articles';
+    return (
+      getRuntimeEnv('NEXT_PUBLIC_CMS_ARTICLES_CONTEXT_PATH') ?? '/articles'
+    );
   }
 
   /**
@@ -93,7 +101,7 @@ class AppConfig {
    * The application can then use a PageQuery to fetch the related information from an external service.
    */
   static get cmsPagesContextPath() {
-    return process.env.NEXT_PUBLIC_CMS_PAGES_CONTEXT_PATH ?? '/pages';
+    return getRuntimeEnv('NEXT_PUBLIC_CMS_PAGES_CONTEXT_PATH') ?? '/pages';
   }
 
   /** The supported LinkedEvent event types. */
@@ -131,13 +139,13 @@ class AppConfig {
   /** Should the application allow HTTP-connections? */
   static get allowUnauthorizedRequests() {
     return Boolean(
-      parseEnvValue(process.env.NEXT_PUBLIC_ALLOW_UNAUTHORIZED_REQUESTS)
+      parseEnvValue(getRuntimeEnv('NEXT_PUBLIC_ALLOW_UNAUTHORIZED_REQUESTS'))
     );
   }
 
   /** A global debug switch for development purposes. */
   static get debug() {
-    return Boolean(parseEnvValue(process.env.NEXT_PUBLIC_DEBUG));
+    return Boolean(parseEnvValue(getRuntimeEnv('NEXT_PUBLIC_DEBUG')));
   }
 
   /** A default HDS theme for the buttons. https://hds.hel.fi/foundation/design-tokens/colour. */
@@ -151,31 +159,31 @@ class AppConfig {
   > = ButtonVariant.Success;
 
   static get matomoConfiguration() {
-    const matomoUrlBase = process.env.NEXT_PUBLIC_MATOMO_URL_BASE;
-    const matomoEnabled = process.env.NEXT_PUBLIC_MATOMO_ENABLED;
-    const matomoSiteId = process.env.NEXT_PUBLIC_MATOMO_SITE_ID;
+    const matomoUrlBase = getRuntimeEnv('NEXT_PUBLIC_MATOMO_URL_BASE');
+    const matomoEnabled = getRuntimeEnv('NEXT_PUBLIC_MATOMO_ENABLED');
+    const matomoSiteId = getRuntimeEnv('NEXT_PUBLIC_MATOMO_SITE_ID');
     const getMatomoUrlPath = (path: string) => `${matomoUrlBase}${path}`;
 
     return {
       disabled: !parseEnvValue(matomoEnabled),
       urlBase: matomoUrlBase as string,
       srcUrl: getMatomoUrlPath(
-        process.env.NEXT_PUBLIC_MATOMO_SRC_URL as string
+        getRuntimeEnv('NEXT_PUBLIC_MATOMO_SRC_URL') as string
       ),
       trackerUrl: getMatomoUrlPath(
-        process.env.NEXT_PUBLIC_MATOMO_TRACKER_URL as string
+        getRuntimeEnv('NEXT_PUBLIC_MATOMO_TRACKER_URL') as string
       ),
       siteId: Number(matomoSiteId),
     };
   }
 
   static askemFeedbackConfiguration(locale: 'en' | 'fi' | 'sv') {
     const askemApiKeyByLocale: Record<typeof locale, string | undefined> = {
-      fi: process.env.NEXT_PUBLIC_ASKEM_API_KEY_FI,
-      sv: process.env.NEXT_PUBLIC_ASKEM_API_KEY_SV,
-      en: process.env.NEXT_PUBLIC_ASKEM_API_KEY_EN,
+      fi: getRuntimeEnv('NEXT_PUBLIC_ASKEM_API_KEY_FI'),
+      sv: getRuntimeEnv('NEXT_PUBLIC_ASKEM_API_KEY_SV'),
+      en: getRuntimeEnv('NEXT_PUBLIC_ASKEM_API_KEY_EN'),
     };
-    const askemEnabled = process.env.NEXT_PUBLIC_ASKEM_ENABLED;
+    const askemEnabled = getRuntimeEnv('NEXT_PUBLIC_ASKEM_ENABLED');
     return {
       disabled: !parseEnvValue(askemEnabled),
       apiKey: askemApiKeyByLocale[locale] ?? '',
@@ -188,7 +196,9 @@ class AppConfig {
    * #on-demand-revalidation
    */
   static get defaultRevalidate() {
-    const envValue = process.env.NEXT_PUBLIC_DEFAULT_ISR_REVALIDATE_SECONDS;
+    const envValue = getRuntimeEnv(
+      'NEXT_PUBLIC_DEFAULT_ISR_REVALIDATE_SECONDS'
+    );
     const value = envValue ? parseEnvValue(envValue) : 60;
 
     if (typeof value !== 'number') {
@@ -224,22 +234,22 @@ class AppConfig {
    */
   static get skipBuildStaticGeneration() {
     return Boolean(
-      parseEnvValue(process.env.SKIP_BUILD_STATIC_GENERATION, false)
+      parseEnvValue(getRuntimeEnv('SKIP_BUILD_STATIC_GENERATION'), false)
     );
   }
 
   /** A feature flag for the similar events. */
   static get showSimilarEvents() {
     return Boolean(
-      parseEnvValue(process.env.NEXT_PUBLIC_SHOW_SIMILAR_EVENTS, true)
+      parseEnvValue(getRuntimeEnv('NEXT_PUBLIC_SHOW_SIMILAR_EVENTS'), true)
     );
   }
 
   /** A feature flag that can be used to show the enrolment status in the card details. */
   static get showEnrolmentStatusInCardDetails() {
     return Boolean(
       parseEnvValue(
-        process.env.NEXT_PUBLIC_SHOW_ENROLMENT_STATUS_IN_CARD_DETAILS,
+        getRuntimeEnv('NEXT_PUBLIC_SHOW_ENROLMENT_STATUS_IN_CARD_DETAILS'),
         false
       )
     );