From 461f96358d543cbcebbd83b730437aa335a4d449 Mon Sep 17 00:00:00 2001
From: fmacheleidt <macheleidt@puzzle.ch>
Date: Wed, 11 Oct 2023 07:06:37 +0000
Subject: [PATCH 1/2] fix compatibility issues during techlab exec

---
 local_env/create-ssh-keys.sh  | 2 +-
 local_env/master/Dockerfile   | 2 +-
 local_env/master/jenkins.yaml | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/local_env/create-ssh-keys.sh b/local_env/create-ssh-keys.sh
index 10d4600..27d1c06 100644
--- a/local_env/create-ssh-keys.sh
+++ b/local_env/create-ssh-keys.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ssh-keygen -t rsa -b 4096 -N "" -f techlab.key -C ""
+ssh-keygen -t ed25519 -N "" -f techlab.key -C ""
 
 TECHLAB_PUBLIC_KEY="$(cat techlab.key.pub)"
 
diff --git a/local_env/master/Dockerfile b/local_env/master/Dockerfile
index d5a22fb..08391be 100644
--- a/local_env/master/Dockerfile
+++ b/local_env/master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.375.1
+FROM jenkins/jenkins:jdk11
 
 # skip the setup wizard
 ENV JAVA_OPTS "-Djenkins.install.runSetupWizard=false -Dpermissive-script-security.enabled=true -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8"
diff --git a/local_env/master/jenkins.yaml b/local_env/master/jenkins.yaml
index 938e534..0b3440b 100644
--- a/local_env/master/jenkins.yaml
+++ b/local_env/master/jenkins.yaml
@@ -11,8 +11,6 @@ jenkins:
   authorizationStrategy:
     loggedInUsersCanDoAnything:
       allowAnonymousRead: false
-  remotingSecurity:
-    enabled: true
   nodes:
   - permanent:
       name: "ssh-agent-docker"
@@ -23,7 +21,7 @@ jenkins:
       launcher:
         ssh:
           credentialsId: "bf5bb957-18bc-45ca-baa8-e7e3cb652405"
-          host: "jenkins_slave_docker"
+          host: "jenkins_agent_docker"
           port: 22
           javaPath: "^${JAVA_HOME}/bin/java"
           sshHostKeyVerificationStrategy: "nonVerifyingKeyVerificationStrategy"

From cdd06d12e859f1b81bc574a26c0fae73c245b7c1 Mon Sep 17 00:00:00 2001
From: fmacheleidt <macheleidt@puzzle.ch>
Date: Fri, 13 Oct 2023 09:16:42 +0000
Subject: [PATCH 2/2] adapting to lts-jdk11

---
 local_env/master/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local_env/master/Dockerfile b/local_env/master/Dockerfile
index 08391be..dfe2179 100644
--- a/local_env/master/Dockerfile
+++ b/local_env/master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:jdk11
+FROM jenkins/jenkins:lts-jdk11
 
 # skip the setup wizard
 ENV JAVA_OPTS "-Djenkins.install.runSetupWizard=false -Dpermissive-script-security.enabled=true -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8"