From 252d140b8ef0f485ea7ad467770c1d8904abc663 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Sun, 11 Jun 2023 11:56:39 +0200
Subject: [PATCH 1/4] switched to prebuilt docker image

---
 automation/Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 118cbf7..285f279 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -2,9 +2,8 @@ pipeline {
     environment {
     }
     agent {
-        dockerfile {
-            dir 'automation'
-            reuseNode true
+        docker {
+            image 'eive-tmtc-ci:d1'
         }
     }
     stages {

From 822eaa4c89b6aadf0bafff94d8867595cd340c2d Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Sun, 11 Jun 2023 12:01:26 +0200
Subject: [PATCH 2/4] removed empty `environment` block in Jenkinsfile which
 Jenkins does not like

diva....
---
 automation/Jenkinsfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 285f279..e63ff47 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -1,6 +1,4 @@
 pipeline {
-    environment {
-    }
     agent {
         docker {
             image 'eive-tmtc-ci:d1'

From acca98126099f21b2cb90fdfa70dd60a1f60a3e7 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Sun, 11 Jun 2023 12:12:47 +0200
Subject: [PATCH 3/4] jenkins user in docker

---
 automation/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/automation/Dockerfile b/automation/Dockerfile
index 9faa42f..61f39b6 100644
--- a/automation/Dockerfile
+++ b/automation/Dockerfile
@@ -4,3 +4,6 @@ RUN apt-get update
 RUN apt-get --yes upgrade
 #tzdata is a dependency, won't install otherwise
 ARG DEBIAN_FRONTEND=noninteractive
+
+#pip needs a valid user to work
+RUN adduser --uid 114 jenkins
\ No newline at end of file

From fc3cf480dcb487f0d1ee5f4e68ed39a8b50c1834 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Sun, 11 Jun 2023 12:14:52 +0200
Subject: [PATCH 4/4] bump docker version

---
 automation/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index e63ff47..e130d35 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-            image 'eive-tmtc-ci:d1'
+            image 'eive-tmtc-ci:d2'
         }
     }
     stages {