Merge branch 'release/2.9.0'

Author: thordy

.github/workflows/docker.image.yaml

@@ -9,23 +9,37 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Get Tag Version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: DockerHub Login
-      uses: docker/login-action@v1.10.0
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Docker Setup QEMU
-      uses: docker/setup-qemu-action@v1.2.0
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: arm,arm64,amd64
     - name: Docker Setup Buildx
-      uses: docker/setup-buildx-action@v1.6.0
+      uses: docker/setup-buildx-action@v3
     - name: Build & Push Docker image (Latest)
       if:   github.event_name == 'push' && startsWith(github.ref, 'refs/heads/')
-      run: docker buildx build . --file Dockerfile -t kcapp/frontend:latest --platform=linux/arm,linux/arm64,linux/amd64 --push
+      run: |
+        docker buildx build . \
+          --file Dockerfile \
+          --cache-from=type=registry,ref=kcapp/frontend:cache \
+          --cache-to=type=registry,ref=kcapp/frontend:cache,mode=max \
+          -t kcapp/frontend:latest \
+          --platform=linux/arm,linux/arm64,linux/amd64 \
+          --push
     - name: Build & Push Docker image (Release version)
       if:   github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-      run: docker buildx build . --file Dockerfile -t kcapp/frontend:${{ env.RELEASE_VERSION }} --platform=linux/arm,linux/arm64,linux/amd64 --push
+      run: |
+        docker buildx build . \
+          --file Dockerfile \
+          --cache-from=type=registry,ref=kcapp/frontend:cache \
+          --cache-to=type=registry,ref=kcapp/frontend:cache,mode=max \
+          -t kcapp/frontend:${{ env.RELEASE_VERSION }} \
+          --platform=linux/arm,linux/arm64,linux/amd64 \
+          --push

.gitignore

@@ -82,3 +82,6 @@ public/images/players
 
 # Ignore SQL files
 *.sql
+
+# Ignore version files
+version.json

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 A preview of major changes can be found in the Wiki ([Latest Changes](https://github.com/kcapp/frontend/wiki/Latest_Changes))
 
+## [2.9.0] - 2025-04-06
+#### Feature
+- Option to see `All` or `Unique` tournament statistics per player
+- Ability to "Remote Start" matches on a selected venue
+- Split tournaments into "Tournaments" and "Seasons"
+- Persist "Enable Voice Announcements" on spectate page
+- Added totals view per group to Tournament Overview
+- Inactive players can now be added via ID from the home page
+- "King Slayer" badge!
+- New Leaderboard page
+- About page showing current versions
+
+#### Changed
+- Include Git commit on kcapp developer badge
+- Updated to latest version of dependencies
+- Update to NodeJS `22`
+
+#### Fixed
+- Issue with the `TTS` gets stuck in certain situations
+- Bug where matches were not correctly forwarded back to main screen
+- Minor UI improvements
+
 ## [2.8.0] - 2024-12-11
 #### Feature
 - New game type `170`
@@ -231,6 +253,7 @@ A preview of major changes can be found in the Wiki ([Latest Changes](https://gi
 - Multiple score entry methods
     - Including [Unicorn Smartboard](https://github.com/kcapp/smartboard)
 
+[2.9.0]: https://github.com/kcapp/frontend/compare/v2.8.0...v2.9.0
 [2.8.0]: https://github.com/kcapp/frontend/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/kcapp/frontend/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/kcapp/frontend/compare/v2.5.0...v2.6.0

Dockerfile

@@ -1,5 +1,6 @@
 # Create our build image
-FROM node:18-alpine AS BUILD_IMAGE
+# Must be node-18, ref https://github.com/docker/build-push-action/issues/1071
+FROM node:18-alpine AS build_image
 
 # Add git and curl
 RUN apk update && apk add --no-cache git curl
@@ -14,13 +15,16 @@ RUN npm install --only=production
 # Bundle app source
 COPY . .
 
+# Write version info into version.json
+RUN node bin/write-version.js
+
 # Create actual image
-FROM node:18-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/kcapp
 
 # Copy required files from build image
-COPY --from=BUILD_IMAGE /usr/src/kcapp /usr/src/kcapp
+COPY --from=build_image /usr/src/kcapp /usr/src/kcapp
 
 EXPOSE 3000
 CMD [ "npm", "run", "docker" ]

app.js

@@ -45,6 +45,7 @@ app.locals.kcapp = {};
 app.locals.kcapp.api = process.env.KCAPP_API || 'http://localhost:8001';
 app.locals.kcapp.api_path = process.env.KCAPP_API_PATH || ':8001';
 app.locals.kcapp.local_admin = process.env.KCAPP_LOCAL_ADMIN ? process.env.KCAPP_LOCAL_ADMIN === "true" : true;
+app.locals.serializedGlobals = { kcapp: true };
 
 // Create all routes
 const socketHandler = require('./routes/lib/socketio_handler')(io, app);
@@ -63,9 +64,6 @@ const venues = require('./routes/venues')(app, socketHandler);
 const badges = require('./routes/badges');
 socketHandler.setupActiveNamespace();
 
-app.locals.moment = require('moment');
-app.locals._ = require('underscore');
-
 // Write access log to a daily rotated file in /log
 const pad = num => (num > 9 ? "" : "0") + num;
 const generator = (time, index) => {

bin/write-version.js

@@ -0,0 +1,15 @@
+const fs = require('fs');
+const { execSync } = require('child_process');
+const packageJson = require('../package.json');
+
+const version = packageJson.version;
+let git_commit = 'unknown';
+
+try {
+  git_commit = execSync('git rev-parse --short HEAD').toString().trim();
+} catch (e) {
+  console.error('Could not get git commit hash', e);
+}
+
+const versionInfo = { version, git_commit };
+fs.writeFileSync('./version.json', JSON.stringify(versionInfo, null, 2));