merge: adopt feature branch changes for APISIX (manifest, Dockerfile, start.sh) and Jenkins (manifest, Dockerfile, start.sh)

CloudronPackages/Jenkins/CloudronManifest.json

@@ -4,7 +4,7 @@
   "author": "Cloudron Packager",
   "description": "Jenkins is an open source automation server which enables developers to reliably build, test, and deploy their software.",
   "tagline": "The leading open source automation server",
-  "version": "1.0.0",
+  "version": "2.516.1",
   "healthCheckPath": "/login",
   "httpPort": 8080,
   "manifestVersion": 2,

CloudronPackages/Jenkins/Dockerfile

@@ -1,25 +1,24 @@
 FROM cloudron/base:4.2.0
 
-# Add Jenkins repository key and repository
+# Add Jenkins repository key and repository, and install Jenkins and dependencies
 RUN apt-get update && \
     apt-get install -y gnupg curl software-properties-common && \
     curl -fsSL https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key | gpg --dearmor -o /usr/share/keyrings/jenkins-keyring.gpg && \
-    echo deb [signed-by=/usr/share/keyrings/jenkins-keyring.gpg] https://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list
-
-# Install Jenkins and required dependencies
-RUN apt-get update && \
+    echo deb [signed-by=/usr/share/keyrings/jenkins-keyring.gpg] https://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list && \
+    apt-get update && \
     apt-get install -y openjdk-17-jdk jenkins fontconfig && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # Install required plugins for Cloudron integration
-RUN mkdir -p /tmp/data/plugins && \
-    cd /tmp/data/plugins && \
-    curl -L -o ldap.hpi https://updates.jenkins.io/latest/ldap.hpi && \
-    curl -L -o oic-auth.hpi https://updates.jenkins.io/latest/oic-auth.hpi && \
-    curl -L -o configuration-as-code.hpi https://updates.jenkins.io/latest/configuration-as-code.hpi && \
-    curl -L -o credentials.hpi https://updates.jenkins.io/latest/credentials.hpi && \
-    chmod 644 *.hpi
+# Plugins: ldap, oic-auth, configuration-as-code, credentials
+RUN curl -L https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-cli/2.516.2/jenkins-cli-2.516.2.jar -o /usr/local/bin/jenkins-cli.jar && \
+    chmod +x /usr/local/bin/jenkins-cli.jar && \
+    java -jar /usr/local/bin/jenkins-cli.jar install-plugin \
+    ldap \
+    oic-auth \
+    configuration-as-code \
+    credentials
 
 # Create template for casc.yaml
 RUN mkdir -p /tmp/data/casc_configs
@@ -46,4 +45,4 @@ RUN usermod -a -G jenkins cloudron && \
 WORKDIR /app/data
 
 # Entry point
-CMD ["/app/code/start.sh"]
+CMD ["/app/code/start.sh"]

CloudronPackages/Jenkins/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 
 # Jenkins home directory
 JENKINS_HOME=/app/data/jenkins_home
@@ -9,9 +9,6 @@ if [[ ! -d "${JENKINS_HOME}" ]]; then
     echo "Initializing Jenkins home directory"
     mkdir -p "${JENKINS_HOME}"
     cp -r /tmp/data/jenkins_home/* "${JENKINS_HOME}/" || true
-    # Copy plugins
-    mkdir -p "${JENKINS_HOME}/plugins"
-    cp -r /tmp/data/plugins/* "${JENKINS_HOME}/plugins/" || true
     # Create directory for JCasC
     mkdir -p "${JENKINS_HOME}/casc_configs"
 fi