Merge branch 'release/v2.319.2-1'

cloudogu · Jan 14, 2022 · 6700706 · 6700706
2 parents c8b9293 + 400d89f
commit 6700706
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v2.319.2-1] - 2022-01-14
+### Changed
+- Upgrade to Jenkins 2.319.2 #101
+- Upgrade dogu-build-lib to 1.6.0
+
+### Fixed
+- Fix certificate creation for subversion at startup
+- Patch JDK to 8.302.08-r1 to fix the jenkins build
+
 ## [v2.303.3-1] - 2021-11-10
 ### Changed
 - Upgrade to Jenkins 2.303.3; #98

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 FROM registry.cloudogu.com/official/java:11.0.11-2
 
 LABEL NAME="official/jenkins" \
-      VERSION="2.303.3-1" \
+      VERSION="2.319.2-1" \
       maintainer="hello@cloudogu.com"
 
     # jenkins home configuration
@@ -12,15 +12,15 @@ ENV JENKINS_HOME=/var/lib/jenkins \
     # mark as webapp for nginx
     SERVICE_TAGS=webapp \
     # jenkins version
-    JENKINS_VERSION=2.303.3 \
+    JENKINS_VERSION=2.319.2 \
     # glibc for alpine version
     GLIBC_VERSION=2.33-r0 \
     SHA256_GLIB_APK="3ce2b708b17841bc5978da0fa337fcb90fec5907daa396585db68805754322e0" \
     SHA256_GLIB_BIN_APK="f862ce6d61b294859f3facd1dae347e7bc5e36714649a37d2a785e7d7a3af84e" \
     SHA256_GLIB_I18N_APK="be3a55e6366a2ddaecf17203a7e71966757dca47a25ce34b5f3d6dd1e1efee55" \
-    SHA256_JENKINS_WAR="8a6ae7367755b3f31a050faa945f7a3991abdb43d941c7294cac890c1e2779d8" \
+    SHA256_JENKINS_WAR="020c8db10469e20e22e68c81e7e83bf35ccb6a435b712c4b643851949e75a553" \
     # additional java version for legacy builds
-    ADDITIONAL_OPENJDK_VERSION="8.282.08-r1"
+    ADDITIONAL_OPENJDK_VERSION="8.302.08-r1"
 
 # Jenkins is ran with user `jenkins`, uid = 1000
 # If you bind mount a volume from host/volume from a data container,

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 #!groovy
-@Library(['github.com/cloudogu/ces-build-lib@v1.48.0', 'github.com/cloudogu/dogu-build-lib@v1.4.1'])
+@Library(['github.com/cloudogu/ces-build-lib@v1.48.0', 'github.com/cloudogu/dogu-build-lib@v1.6.0'])
 import com.cloudogu.ces.cesbuildlib.*
 import com.cloudogu.ces.dogubuildlib.*
 
@@ -98,6 +98,7 @@ node('vagrant') {
 
                     // Wait for upgraded dogu to get healthy
                     ecoSystem.waitForDogu(doguName)
+                    // TODO: Replace this with "ecosystem.waitUntilAvailable(doguName)" from dogu-build-lib 1.5.0
                     // curl the dogu URL until the "Dogu is starting" page (status code 503) is gone
                     // and the CAS login page is returned (status code 302)
                     String externalIP = ecoSystem.externalIP

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/jenkins",
-  "Version": "2.303.3-1",
+  "Version": "2.319.2-1",
   "DisplayName": "Jenkins CI",
   "Description": "Jenkins Continuous Integration Server",
   "Category": "Development Apps",

diff --git a/resources/startup.sh b/resources/startup.sh
@@ -101,6 +101,15 @@ function createSubversionCertificates() {
   local subversionConfigDir="${homeDir}/.subversion"
   local subversionConfigFile="${subversionConfigDir}/servers"
 
+  BASE_CREATE_CERT_SKRIPT="/usr/bin/create-ca-certificates.sh"
+
+  sourcingExitCode=0
+  # shellcheck disable=SC1090
+  source "${BASE_CREATE_CERT_SKRIPT}" || sourcingExitCode=$?
+  if [[ ${sourcingExitCode} -ne 0 ]]; then
+    echo "ERROR: An error occurred while sourcing ${BASE_CREATE_CERT_SKRIPT}."
+  fi
+
   if ! existAdditionalCertificates ; then
     return 0
   fi