diff options
Diffstat (limited to 'system/jenkins')
| -rw-r--r-- | system/jenkins/README | 6 | ||||
| -rw-r--r-- | system/jenkins/files/jenkins.conf | 6 | ||||
| -rw-r--r-- | system/jenkins/files/jenkinsd.sh | 10 | ||||
| -rw-r--r-- | system/jenkins/jenkins.SlackBuild | 11 | ||||
| -rw-r--r-- | system/jenkins/jenkins.info | 8 |
5 files changed, 16 insertions, 25 deletions
diff --git a/system/jenkins/README b/system/jenkins/README index e900430c79..0adb276db7 100644 --- a/system/jenkins/README +++ b/system/jenkins/README @@ -14,3 +14,9 @@ for example: groupadd -g 251 jenkins useradd -g 251 -u 251 -r -s /bin/bash -d /var/lib/jenkins jenkins + +This LTS supports Java 11, Java 17, or Java 21. The REQUIRES has +zulu-openjdk21, but you can use your choice of version and +vendor. + +https://www.jenkins.io/doc/book/platform-information/support-policy-java/ diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf index 8b9688362b..fbdbcb875b 100644 --- a/system/jenkins/files/jenkins.conf +++ b/system/jenkins/files/jenkins.conf @@ -52,12 +52,6 @@ JENKINS_USER="jenkins" ## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509 #JENKINS_HTTPS_KEY_MANAGER="SunX509" -## this along with JENKINS_HTTPS_CERTIFICATE can be used to run HTTPS with -## OpenSSL secret key file and the corresponding certificate file -#JENKINS_HTTPS_PRIVATE_KEY="" - -#JENKINS_HTTPS_CERTIFICATE="" - ## Default home of jenkins stuffs #JENKINS_HOME=/var/lib/jenkins diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh index 0e616bc9aa..1bed3e1f13 100644 --- a/system/jenkins/files/jenkinsd.sh +++ b/system/jenkins/files/jenkinsd.sh @@ -79,14 +79,6 @@ if [ "$JENKINS_HTTPS_KEY_MANAGER" != "" ] ; then JENKINS_HTTPS_KEY_MANAGER_ARG="--httpsKeyManagerType=$JENKINS_HTTPS_KEY_MANAGER" fi -if [ "$JENKINS_HTTPS_PRIVATE_KEY" != "" ] ; then - JENKINS_HTTPS_PRIVATE_KEY="--httpsPrivateKey=$JENKINS_HTTPS_PRIVATE_KEY" -fi - -if [ "$JENKINS_HTTPS_CERTIFICATE" != "" ] ; then - JENKINS_HTTPS_CERTIFICATE="--httpsCertificate=$JENKINS_HTTPS_CERTIFICATE" -fi - if [ "$JENKINS_LOG_FILE" != "" ] ; then JENKINS_LOG_FILE_ARG="--logfile=$JENKINS_LOG_FILE" fi @@ -114,8 +106,6 @@ su - $JENKINS_USER -c " \ $JENKINS_HTTPS_KEYSTORE_ARG \ $JENKINS_HTTPS_KEYSTORE_PASSWORD_ARG \ $JENKINS_HTTPS_KEY_MANAGER_ARG \ - $JENKINS_HTTPS_PRIVATE_KEY \ - $JENKINS_HTTPS_CERTIFICATE \ $JENKINS_LOG_FILE_ARG \ $JENKINS_WEBAPPSDIR_ARG \ $JENKINS_WEBROOT_ARG \ diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index aafad23fb1..7e527bc8a5 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy # Copyright 2017-2022 Andrew Clemons, Wellington, New Zealand +# Copyright 2022-2024 Andrew Clemons, Tokyo, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jenkins -VERSION=${VERSION:-2.332.3} +VERSION=${VERSION:-2.462.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -63,7 +64,7 @@ cd $PKG mkdir -p $PKG/usr/share/$PRGNAM cp $CWD/$PRGNAM.war $PKG/usr/share/$PRGNAM/$PRGNAM.war -chown -R jenkins.jenkins $PKG/usr/share/$PRGNAM +chown -R jenkins:jenkins $PKG/usr/share/$PRGNAM mkdir -p $PKG/usr/bin cat $CWD/files/jenkins.bin.sh > $PKG/usr/bin/jenkins @@ -72,7 +73,7 @@ chmod 0755 $PKG/usr/bin/* mkdir -p $PKG/etc/$PRGNAM cp $CWD/files/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new -JAVAEXEC=`which java` +JAVAEXEC=$( which java ) sed -i "s|#JAVA=/usr/lib/java/bin/java|#JAVA=${JAVAEXEC}|" $PKG/etc/$PRGNAM/$PRGNAM.conf.new mkdir -p $PKG/etc/logrotate.d @@ -82,12 +83,12 @@ mkdir -p $PKG/etc/rc.d cp $CWD/files/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new mkdir -p $PKG/var/lib/$PRGNAM/apps -chown jenkins.jenkins $PKG/var/lib/$PRGNAM +chown jenkins:jenkins $PKG/var/lib/$PRGNAM mkdir -p $PKG/var/log/$PRGNAM touch $PKG/var/log/$PRGNAM/jenkins.log.new touch $PKG/var/log/$PRGNAM/jenkins_console.log.new -chown -R jenkins.jenkins $PKG/var/log/$PRGNAM +chown -R jenkins:jenkins $PKG/var/log/$PRGNAM # We can't depend on this directory persisting across reboots, since /var/run # is often on tmpfs (or even linked to /run), so we'll create this in the diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info index b6cb6515ad..5f1f0a266a 100644 --- a/system/jenkins/jenkins.info +++ b/system/jenkins/jenkins.info @@ -1,10 +1,10 @@ PRGNAM="jenkins" -VERSION="2.332.3" +VERSION="2.462.2" HOMEPAGE="https://www.jenkins.io/" -DOWNLOAD="https://get.jenkins.io/war-stable/2.332.3/jenkins.war" -MD5SUM="747de212d01aefcb676cddc55d4a78ea" +DOWNLOAD="https://get.jenkins.io/war-stable/2.462.2/jenkins.war" +MD5SUM="ecf546d535f2b5a7e3177c11d2def3de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zulu-openjdk11" +REQUIRES="zulu-openjdk21" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" |