From 8bbb51acfa1512f4508bb6393916e1262b3b661c Mon Sep 17 00:00:00 2001
From: Mourits de Beer <31511766+ff137@users.noreply.github.com>
Date: Wed, 18 Dec 2024 12:21:52 +0200
Subject: [PATCH] :construction_worker: Fix Scala Steward running on
 ubuntu-latest (#146)

* :construction_worker: Fix Scala Steward running on ubuntu-latest

* :construction_worker: Add SBT setup

* :bug: Change uid to 1001

* :art: Update settings
---
 .github/workflows/ci.yml            | 2 ++
 .github/workflows/scala-steward.yml | 3 +++
 .vscode/settings.json               | 5 ++++-
 Dockerfile                          | 2 +-
 helm/dawn-patrol/values.yaml        | 4 ++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1b5d77..88a54cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,6 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: coursier/cache-action@v6
+      - uses: sbt/setup-sbt@v1
       - uses: VirtusLab/scala-cli-setup@v1
         with:
           jvm: 21
@@ -60,6 +61,7 @@ jobs:
           password: ${{ github.token }}
 
       - uses: coursier/cache-action@v6
+      - uses: sbt/setup-sbt@v1
       - uses: VirtusLab/scala-cli-setup@v1
         with:
           jvm: 21
diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
index 871738d..71fc8aa 100644
--- a/.github/workflows/scala-steward.yml
+++ b/.github/workflows/scala-steward.yml
@@ -1,4 +1,5 @@
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 0 * * *"
 
@@ -11,6 +12,8 @@ jobs:
       GITHUB_TOKEN: ${{ github.token }}
     name: Launch Scala Steward
     steps:
+      - name: Setup SBT
+        uses: sbt/setup-sbt@v1
       - name: Launch Scala Steward
         uses: scala-steward-org/scala-steward-action@v2
         with:
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 70dfafb..19695ef 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,5 +3,8 @@
   "files.trimFinalNewlines": true,
   "files.eol": "\n",
   "files.trimTrailingWhitespace": true,
-  "files.encoding": "utf8"
+  "files.encoding": "utf8",
+  "files.watcherExclude": {
+    "**/target": true
+  }
 }
diff --git a/Dockerfile b/Dockerfile
index 258d04c..f9c0eb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:21
 
-RUN adduser --system --group --uid 1000 --shell /bin/bash dawn
+RUN adduser --system --group --uid 1001 --shell /bin/bash dawn
 
 WORKDIR /app
 COPY --chown=0:0 ./target/dawn-patrol ./dawn-patrol
diff --git a/helm/dawn-patrol/values.yaml b/helm/dawn-patrol/values.yaml
index 643dbd9..edf8e07 100644
--- a/helm/dawn-patrol/values.yaml
+++ b/helm/dawn-patrol/values.yaml
@@ -40,12 +40,12 @@ podLabels:
   admission.datadoghq.com/enabled: 'false'
 
 podSecurityContext:
-  fsGroup: 1000
+  fsGroup: 1001
 
 securityContext:
   # readOnlyRootFilesystem: true
   runAsNonRoot: true
-  runAsUser: 1000
+  runAsUser: 1001
   # capabilities:
   #   drop:
   #   - ALL