Merge branch 'feature/use-scone-5.7' into main

jbern0rd · jbern0rd · commit ea3a4f47a3ff · 2022-08-03T17:09:26.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('global-jenkins-library@1.9.0') _
+@Library('global-jenkins-library@2.1.1') _
 
 buildInfo = getBuildInfo()
 
@@ -14,4 +14,5 @@ sconeBuildUnlocked(
   imageName:       'python-hello-world',
   imageTag:        buildInfo.imageTag,
   sconifyArgsPath: 'cloud-computing/sconify.args',
+  sconifyVersion:  '5.7.1'
 )
diff --git a/cloud-computing/sconify.args b/cloud-computing/sconify.args
@@ -7,7 +7,7 @@
 --host-path=/etc/resolv.conf \
 --binary=/usr/local/bin/python3.7 \
 --heap=1G \
---dlopen=2 \
+--dlopen=1 \
 --no-color \
 --verbose \
 --command="python3 /app/app.py"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@Library('global-jenkins-library@1.9.0') _`
	`1`	`+@Library('global-jenkins-library@2.1.1') _`
`2`	`2`
`3`	`3`	`buildInfo = getBuildInfo()`
`4`	`4`
`@@ -14,4 +14,5 @@ sconeBuildUnlocked(`
`14`	`14`	`imageName: 'python-hello-world',`
`15`	`15`	`imageTag: buildInfo.imageTag,`
`16`	`16`	`sconifyArgsPath: 'cloud-computing/sconify.args',`
	`17`	`+ sconifyVersion: '5.7.1'`
`17`	`18`	`)`