Fix pre-commit and docker build issues

Copilot · commjoen · Copilot · commit 9d44c3693789 · 2025-09-18T08:14:40.000Z
Co-authored-by: commjoen &lt;1457214+commjoen@users.noreply.github.com&gt;
diff --git a/.github/scripts/docker-create.sh b/.github/scripts/docker-create.sh
@@ -379,10 +379,10 @@ create_containers() {
         docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets:$tag-k8s-vault --build-arg "$buildarg" --build-arg "PORT=8081" --build-arg "argBasedVersion=$tag" --build-arg "spring_profile=kubernetes-vault" --secret id=mysecret,env=SECRET_VALUE --push ./../../.
         docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets:latest-k8s-vault --build-arg "$buildarg" --build-arg "PORT=8081" --build-arg "argBasedVersion=$tag" --build-arg "spring_profile=kubernetes-vault" --secret id=mysecret,env=SECRET_VALUE --push ./../../.
         cd ../..
-        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop:$tag -f Dockerfile_webdesktop --secret id=mysecret,env=SECRET_VALUE --push .
-        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop:latest -f Dockerfile_webdesktop --secret id=mysecret,env=SECRET_VALUE --push .
-        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop-k8s:$tag -f Dockerfile_webdesktopk8s --secret id=mysecret,env=SECRET_VALUE --push .
-        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop-k8s:latest -f Dockerfile_webdesktopk8s --secret id=mysecret,env=SECRET_VALUE --push .
+        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop:$tag -f Dockerfile_webdesktop --push .
+        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop:latest -f Dockerfile_webdesktop --push .
+        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop-k8s:$tag -f Dockerfile_webdesktopk8s --push .
+        docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-desktop-k8s:latest -f Dockerfile_webdesktopk8s --push .
         cd k8s/challenge53
         cp ../../src/main/resources/executables/wrongsecrets-challenge53-* ./executables
         docker buildx build --no-cache --platform linux/amd64,linux/arm64 -t jeroenwillemsen/wrongsecrets-challenge53:$tag -f Dockerfile --push .
diff --git a/.github/workflows/pr-desktop-containers.yml b/.github/workflows/pr-desktop-containers.yml
@@ -173,4 +173,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: comment
-            });
+            });
diff --git a/Dockerfile_webdesktop b/Dockerfile_webdesktop
@@ -44,3 +44,4 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
 COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/
 
 COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
+
diff --git a/Dockerfile_webdesktopk8s b/Dockerfile_webdesktopk8s
@@ -52,3 +52,4 @@ COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/
 RUN sudo chown abc /var/tmp/wrongsecrets
 
 COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
+

Original file line number	Diff line number	Diff line change
`@@ -44,3 +44,4 @@ COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/`
`44`	`44`	`COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/`
`45`	`45`
`46`	`46`	`COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh`
	`47`	`+`
Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,4 @@ COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/`
`52`	`52`	`RUN sudo chown abc /var/tmp/wrongsecrets`
`53`	`53`
`54`	`54`	`COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh`
	`55`	`+`