Merge pull request 'fix(deps): update docker base image' (#20 ) from renovate/docker-base-image into main

fix(deps): update docker base image
Merge pull request 'feat: match original theme to authentic 1987 DLR livery' (#19 ) from feat/original-theme-dlr-livery into main
2026-06-16 01:08:54 +01:00 · 2026-06-16 00:04:29 +00:00 · 2026-06-12 13:08:59 +01:00 · 2026-06-12 13:05:37 +01:00 · 2026-06-12 12:42:29 +01:00 · 2026-06-12 12:39:56 +01:00
4 changed files with 37 additions and 10 deletions
@@ -1,10 +1,30 @@
 name: Build and publish container

 on:
+  # On merge to main, only build/release when image-affecting files change;
+  # CI-config, Renovate-config and docs changes do not produce a new image.
  push:
    branches: [main]
+    paths:
+      - 'Dockerfile'
+      - 'default.conf'
+      - 'index.html'
+      - 'styles.css'
+      - 'script.js'
+      - 'messages.js'
+      - '.dockerignore'
+  # Pull requests always run (the build is a required check); no path filter.
  pull_request:
    branches: [main]
+  workflow_dispatch:
+
+# A newer run cancels an older in-flight run in the same group (keyed by ref),
+# so a fresh merge to main supersedes the previous build and only the latest
+# release is produced, avoiding tags that would be immediately replaced. Each
+# pull request likewise supersedes only its own earlier runs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

 defaults:
  run:
@@ -1,7 +1,7 @@
 # Lightweight, non-root nginx serving the static site.
 # Runs as user "nginx" and listens on 8080, ready to sit behind an
 # external reverse proxy that terminates TLS and forwards requests.
-FROM nginxinc/nginx-unprivileged:1.31-alpine-slim@sha256:6616de6eaa82bc2ee3541fa287a8fca7dc7271e6374e9402014dbd13f4a980ae
+FROM nginxinc/nginx-unprivileged:1.31-alpine-slim@sha256:762e8e4e5e103817c4158400fc3753c8e713ff8153b8c3afbb458ae4572bc9a3

 COPY default.conf /etc/nginx/conf.d/default.conf
 COPY --chown=nginx:nginx index.html styles.css script.js messages.js /usr/share/nginx/html/
@@ -4,6 +4,9 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>Why is the DLR shut today?</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Rokkitt:wght@400;700;800&display=swap">
  <link rel="stylesheet" href="styles.css">
 </head>
 <body data-theme="modern">
@@ -19,16 +19,20 @@
  --button-active-text: #ffffff;
 }

-/* Original DLR — 1987 red, white and blue */
+/* Original DLR — 1987 P86/P89 livery: blue body and skirt, red band and
+   doors, white stripes. Blue is the dominant field, red the accent.
+   1987 branding used the Rockwell slab serif; Rokkitt is a free fallback for
+   systems without Rockwell installed. */
 [data-theme="original"] {
-  --bg: #c8102e;
-  --surface: #002b5c;
-  --text: #f5f0e1;
-  --message: #f5f0e1;
-  --button-bg: #002b5c;
-  --button-text: #f5f0e1;
-  --button-active-bg: #f5f0e1;
-  --button-active-text: #002b5c;
+  --font-stack: Rockwell, "Rockwell Nova", Rokkitt, Georgia, serif;
+  --bg: #1f3a93;
+  --surface: #c8102e;
+  --text: #ffffff;
+  --message: #ffffff;
+  --button-bg: #c8102e;
+  --button-text: #ffffff;
+  --button-active-bg: #ffffff;
+  --button-active-text: #1f3a93;
 }

 * {
Author	SHA1	Message	Date
renovate-bot	2590df3c13	Merge pull request 'fix(deps): update docker base image' (#20 ) from renovate/docker-base-image into main Build and publish container / build (push) Successful in 4m36s Details	2026-06-16 01:08:54 +01:00
Renovate Bot	59d53c515d	fix(deps): update docker base image Build and publish container / build (pull_request) Successful in 4m17s Details	2026-06-16 00:04:29 +00:00
lyrathorpe	4690263ba8	Merge pull request 'feat: match original theme to authentic 1987 DLR livery' (#19 ) from feat/original-theme-dlr-livery into main Build and publish container / build (push) Successful in 2m43s Details Reviewed-on: #19	2026-06-12 13:08:59 +01:00
Emma Thorpe	e31729e27a	feat: match original theme to authentic 1987 DLR livery Build and publish container / build (pull_request) Successful in 1m52s Details Set the original colour scheme's typeface and palette to the 1987 Docklands Light Railway P86/P89 stock. - Use the Rockwell slab serif (the original DLR branding typeface) for the original theme, with Rokkitt loaded as a free fallback for systems without Rockwell installed. - Flip the palette to be blue-dominant: blue body/skirt as the field, red band/doors as the accent, white stripes, matching the rolling stock.	2026-06-12 13:05:37 +01:00
lyrathorpe	c5433a23ee	Merge pull request 'ci: filter main builds to code changes and cancel superseded runs' (#18 ) from ci/optimise-main-builds into main Reviewed-on: #18	2026-06-12 12:42:29 +01:00
Emma Thorpe	fb705c234f	ci: filter main builds to code changes and cancel superseded runs Build and publish container / build (pull_request) Successful in 1m35s Details Apply path filters to the push (merge-to-main) trigger only, so merges that do not change the image (CI/Renovate config, docs) skip the build and release. Pull requests keep running unfiltered so the required check is always reported. Add a concurrency group keyed by ref with cancel-in-progress, so a newer run supersedes an older in-flight run: a fresh merge to main cancels the previous build and only the most recent release is produced, avoiding tags that would be immediately replaced. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-12 12:39:56 +01:00