From aef38602149b592188b1f30bffd0983a6247d921 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 12 May 2023 18:42:38 +0100 Subject: [PATCH] [bitnami/jenkins] Release 2.387.3-debian-11-r3 (#33678) Signed-off-by: Bitnami Containers --- bitnami/jenkins/2/debian-11/Dockerfile | 4 ++-- .../debian-11/prebuildfs/opt/bitnami/scripts/libos.sh | 2 +- .../rootfs/opt/bitnami/scripts/jenkins-env.sh | 6 ++---- .../rootfs/opt/bitnami/scripts/jenkins/run.sh | 1 + bitnami/jenkins/README.md | 10 ++++------ 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bitnami/jenkins/2/debian-11/Dockerfile b/bitnami/jenkins/2/debian-11/Dockerfile index 265879a1cf77..2e2fd36e6337 100644 --- a/bitnami/jenkins/2/debian-11/Dockerfile +++ b/bitnami/jenkins/2/debian-11/Dockerfile @@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-09T16:29:08Z" \ + org.opencontainers.image.created="2023-05-12T17:10:54Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.387.3-debian-11-r2" \ + org.opencontainers.image.ref.name="2.387.3-debian-11-r3" \ org.opencontainers.image.title="jenkins" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.387.3" diff --git a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 02c989d693ae..6d9ca8546eef 100644 --- a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -421,7 +421,7 @@ generate_random_string() { alphanumeric+special|special+alphanumeric) # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex - filter='a-zA-Z0-9!@#$%^' + filter='a-zA-Z0-9:@.,/+!=' ;; *) echo "Invalid type ${type}" >&2 diff --git a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins-env.sh b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins-env.sh index b9b608cad1b8..3eb7698d75d7 100644 --- a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins-env.sh +++ b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins-env.sh @@ -42,12 +42,12 @@ jenkins_env_vars=( JENKINS_ENABLE_SWARM JENKINS_CERTS_DIR JENKINS_KEYSTORE_PASSWORD + JENKINS_OPTS JENKINS_USERNAME JENKINS_PASSWORD JENKINS_EMAIL JENKINS_SWARM_USERNAME JENKINS_SWARM_PASSWORD - JENKINS_OPTS JAVA_HOME JAVA_OPTS DISABLE_JENKINS_INITIALIZATION @@ -108,6 +108,7 @@ export JENKINS_SKIP_BOOTSTRAP="${JENKINS_SKIP_BOOTSTRAP:-no}" # only used during export JENKINS_ENABLE_SWARM="${JENKINS_ENABLE_SWARM:-no}" export JENKINS_CERTS_DIR="${JENKINS_CERTS_DIR:-${JENKINS_HOME}}" export JENKINS_KEYSTORE_PASSWORD="${JENKINS_KEYSTORE_PASSWORD:-bitnami}" +export JENKINS_OPTS="${JENKINS_OPTS:-}" # Jenkins credentials export JENKINS_USERNAME="${JENKINS_USERNAME:-user}" # only used during the first initialization @@ -116,9 +117,6 @@ export JENKINS_EMAIL="${JENKINS_EMAIL:-user@example.com}" # only used during the export JENKINS_SWARM_USERNAME="${JENKINS_SWARM_USERNAME:-swarm}" # only used during the first initialization export JENKINS_SWARM_PASSWORD="${JENKINS_SWARM_PASSWORD:-}" # only used during the first initialization -# Jenkins launcher parameters -export JENKINS_OPTS="${JENKINS_OPTS:-}" - # Java configuration export JAVA_HOME="${JAVA_HOME:-${BITNAMI_ROOT_DIR}/java}" export JAVA_OPTS="${JAVA_OPTS:-}" diff --git a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins/run.sh b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins/run.sh index c7b96cd4591e..82f95e379fca 100755 --- a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins/run.sh +++ b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/jenkins/run.sh @@ -19,6 +19,7 @@ if [[ -n "${JAVA_OPTS:-}" ]]; then read -r -a java_opts <<<"$JAVA_OPTS" args+=("${java_opts[@]}") fi + args+=("-Duser.home=${JENKINS_HOME}" "-jar" "${JENKINS_BASE_DIR}/jenkins.war") if is_boolean_yes "$JENKINS_FORCE_HTTPS"; then args+=( diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 9f791d6ba2ae..c9eb3f619eaa 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -25,6 +25,8 @@ You can find the default credentials and available configuration options in the * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released on a regular basis with the latest distribution packages available. +Looking to use Jenkins in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## How to deploy Jenkins in Kubernetes? Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami Jenkins Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/jenkins). @@ -188,10 +190,6 @@ Available environment variables: * `JAVA_OPTS`: Customize JVM parameters. No defaults. -#### JENKINS configuration - -* `JENKINS_OPTS`: Customize Jenkins launcher parameters. No defaults. - ## Logging The Bitnami Jenkins Docker image sends the container logs to `stdout`. To view the logs: @@ -322,9 +320,9 @@ docker run -d --name jenkins -p 80:8080 \ bitnami/jenkins:latest ``` -### Configuring reverse proxy +### Using custom launcher parameters -If you need to install Jenkins behind a reverse proxy with a prefix, such as mycompany.com/jenkins, you can use the "JENKINS_OPTS" environment variable for this purpose: +In order to use custom parameters for Jenkins launcher, for example if you need to install Jenkins behind a reverse proxy with a prefix such as mycompany.com/jenkins, you can use the "JENKINS_OPTS" environment variable: ```console docker run -d --name jenkins -p 8080:8080 \