chore: add changes made for stp 25

Author: Kuenssi

.github/workflows/ci-cd.yml

@@ -1,61 +1,53 @@
-name: CI/CD
+name: Deploy
 
 on:
-  - push
+  push:
+    tags:
+      - 'v*'
 
 jobs:
-  deployment:
-    name: Deployment Setup
+  backend:
+    name: Backend
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
       - name: Set Deployment Options
         id: deployment
         run: |
           case "$GITHUB_REF" in
             refs/tags/v*)
               VERSION="${GITHUB_REF:11}"
-              PREFIX="${GITHUB_REF:11:1}"
+              MAJOR="${GITHUB_REF:11:1}"
           ;;
           esac
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=prefix::$PREFIX"
-    outputs:
-      version: ${{ steps.deployment.outputs.version }}
-      prefix: ${{ steps.deployment.outputs.prefix }}
-
-  backend:
-    name: Backend
-    runs-on: ubuntu-latest
-    needs: [ deployment ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Build the Docker Image
-        if: needs.deployment.outputs.version
-        uses: whoan/docker-build-with-cache-action@v5
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "major=$MAJOR" >> "$GITHUB_OUTPUT"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
+          registry: ${{ secrets.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          registry: ${{ secrets.DOCKER_REGISTRY }}
-          image_name: stp/settlers
-          image_tag: ${{ needs.deployment.outputs.prefix }},${{ needs.deployment.outputs.version }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_REGISTRY }}/stp/settlers:${{ steps.deployment.outputs.version }}
+            ${{ secrets.DOCKER_REGISTRY }}/stp/settlers:${{ steps.deployment.outputs.major }}
+          cache-to: type=gha,mode=max
+          cache-from: type=gha
       - name: Rancher Deploy
-        if: needs.deployment.outputs.version
-        uses: sekassel-research/actions-rancher-update@2.0.2
+        uses: sekassel-research/actions-rancher-update@v3.0.0
         with:
           rancher_url: ${{ secrets.RANCHER_URL }}
           rancher_token: ${{ secrets.RANCHER_TOKEN }}
           cluster_id: ${{ secrets.CLUSTER_ID }}
           project_id: ${{ secrets.PROJECT_ID }}
           namespace: ${{ secrets.NAMESPACE }}
-          deployment: ${{ secrets.DEPLOYMENT }}-v${{ needs.deployment.outputs.prefix }}
-          docker_image: ${{ secrets.DOCKER_REGISTRY }}/stp/settlers:${{ needs.deployment.outputs.version }}
-      - name: Discord Notification
-        if: needs.deployment.outputs.version
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
-        with:
-          args: |
-            Eine neue Serverversion ist verfügbar: `${{ needs.deployment.outputs.version }}`
-            <https://pioneers.uniks.de/api/v${{ needs.deployment.outputs.prefix }}>
+          deployment: ${{ secrets.DEPLOYMENT }}-v${{ steps.deployment.outputs.major }}
+          docker_image: ${{ secrets.DOCKER_REGISTRY }}/stp/settlers:${{ steps.deployment.outputs.version }}

Dockerfile

@@ -1,16 +1,16 @@
-FROM node:16-slim as builder
+FROM node:22-slim as builder
 RUN npm install -g pnpm
 WORKDIR /app
-COPY package.json pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 RUN pnpm install
 COPY . .
 RUN pnpm run build
 
-FROM node:16-slim
+FROM node:22-slim
 RUN npm install -g pnpm
 WORKDIR /app
 ENV NODE_ENV=production
-COPY package.json pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 RUN pnpm install
 COPY --from=builder /app/dist ./dist
 COPY docs ./docs

package.json

@@ -1,7 +1,7 @@
 {
   "name": "stpst22-server",
   "version": "0.0.1",
-  "description": "The server for the STP in summer term 2022",
+  "description": "The server for the STP in summer term 2022 and 2025",
   "author": "Adrian Kunz",
   "private": true,
   "license": "UNLICENSED",
@@ -20,58 +20,65 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "^8.4.7",
-    "@nestjs/core": "^8.4.7",
-    "@nestjs/event-emitter": "^1.1.1",
-    "@nestjs/jwt": "^8.0.1",
-    "@nestjs/mapped-types": "^1.0.1",
-    "@nestjs/microservices": "^8.4.7",
-    "@nestjs/mongoose": "^8.0.1",
-    "@nestjs/passport": "^8.2.2",
-    "@nestjs/platform-express": "^8.4.7",
-    "@nestjs/platform-ws": "^8.4.7",
-    "@nestjs/schedule": "^1.1.0",
-    "@nestjs/swagger": "^5.2.1",
-    "@nestjs/throttler": "^2.0.1",
-    "@nestjs/websockets": "^8.4.7",
-    "bcrypt": "^5.0.1",
+    "@nestjs/common": "^11.0.12",
+    "@nestjs/core": "^11.0.12",
+    "@nestjs/event-emitter": "^3.0.1",
+    "@nestjs/jwt": "^11.0.0",
+    "@nestjs/mapped-types": "^2.1.0",
+    "@nestjs/microservices": "^11.0.12",
+    "@nestjs/mongoose": "^11.0.3",
+    "@nestjs/passport": "^11.0.5",
+    "@nestjs/platform-express": "^11.0.12",
+    "@nestjs/platform-ws": "^11.0.12",
+    "@nestjs/schedule": "^5.0.1",
+    "@nestjs/swagger": "^11.1.0",
+    "@nestjs/throttler": "^6.4.0",
+    "@nestjs/websockets": "^11.0.12",
+    "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.2",
-    "express": "^4.18.1",
-    "memoizee": "^0.4.15",
-    "mongoose": "^5.13.14",
-    "nats": "^2.7.1",
-    "passport": "^0.5.3",
-    "passport-jwt": "^4.0.0",
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
-    "rxjs": "^7.5.5",
-    "swagger-ui-express": "^4.4.0"
+    "class-validator": "^0.14.1",
+    "cron": "^4.1.3",
+    "express": "^5.1.0",
+    "glob": "^11.0.1",
+    "memoizee": "^0.4.17",
+    "mongoose": "^8.13.1",
+    "nats": "^2.29.3",
+    "passport": "^0.7.0",
+    "passport-jwt": "^4.0.1",
+    "reflect-metadata": "^0.2.2",
+    "rimraf": "^6.0.1",
+    "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@nestjs/cli": "^8.2.8",
-    "@nestjs/schematics": "^8.0.11",
-    "@nestjs/testing": "^8.4.7",
-    "@types/bcrypt": "^5.0.0",
-    "@types/cron": "^1.7.3",
-    "@types/express": "^4.17.13",
-    "@types/jest": "^26.0.24",
-    "@types/memoizee": "^0.4.8",
-    "@types/node": "^16.11.42",
-    "@types/passport-jwt": "^3.0.6",
-    "@types/supertest": "^2.0.12",
-    "@types/validator": "^13.7.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "eslint": "^7.32.0",
-    "jest": "^26.6.3",
-    "supertest": "^6.2.4",
-    "ts-jest": "^26.5.6",
-    "ts-loader": "^8.4.0",
-    "ts-node": "^9.1.1",
-    "tsconfig-paths": "^3.14.1",
-    "typescript": "^4.7.4",
-    "webpack": "^5.73.0"
+    "@nestjs/cli": "^11.0.5",
+    "@nestjs/schematics": "^11.0.2",
+    "@nestjs/testing": "^11.0.12",
+    "@types/bcrypt": "^5.0.2",
+    "@types/express": "^5.0.1",
+    "@types/jest": "^29.5.14",
+    "@types/memoizee": "^0.4.12",
+    "@types/node": "^22.13.17",
+    "@types/passport-jwt": "^4.0.1",
+    "@types/supertest": "^6.0.3",
+    "@types/validator": "^13.12.3",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
+    "eslint": "^9.23.0",
+    "jest": "^29.7.0",
+    "supertest": "^7.1.0",
+    "ts-jest": "^29.3.1",
+    "ts-loader": "^9.5.2",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.8.2",
+    "webpack": "^5.98.0"
+  },
+  "resolutions": {
+    "glob": "^11.0.1",
+    "npmlog": "^7.0.1",
+    "rimraf": "^6.0.1",
+    "gauge": "^5.0.2",
+    "are-we-there-yet": "^4.0.2"
   },
   "jest": {
     "moduleFileExtensions": [