diff --git a/bitnami/jenkins/2/debian-11/Dockerfile b/bitnami/jenkins/2/debian-11/Dockerfile index bda0cff215fc..88f075cdccfb 100644 --- a/bitnami/jenkins/2/debian-11/Dockerfile +++ b/bitnami/jenkins/2/debian-11/Dockerfile @@ -7,13 +7,14 @@ ENV HOME="/" \ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" COPY prebuildfs / +SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl fontconfig gzip libbrotli1 libc6 libcom-err2 libcurl4 libffi7 libfontconfig1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 openssh-client procps tar unzip zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-150" --checksum da4a2f759ccc57c100d795b71ab297f48b31c4dd7578d773d963bbd49c42bd7b RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.3-150" --checksum 8b992a5ee513c5eaca52b19232b21a93588ddf4c4850be4d47c6f19b11d1d90a RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.15-150" --checksum fe6b65886a6b1f545508e272efbf422054ee030c867f94ebec2f93c5518252de -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.36.1-150" --checksum c15ff3fff7478e74922d560c5c4ffcb8d11bff92975f81591b62742902edd731 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "jenkins" "2.332.3-150" --checksum 89394cca5f34e4bd2ac6a4d813ccbd25bde411ff62b1208419e6ed82c4e94e36 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.37.0-0" --checksum 75341efddd4113ca16df9815f6e015881c73f71c66c412a43e2ed7cc4fa7f177 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "jenkins" "2.346.1-0" --checksum 23b49c9f7e9feb754f550fd93b7cc80be06de788ae1c3e081968d44ae8338f99 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -21,7 +22,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/jenkins/postunpack.sh -ENV APP_VERSION="2.332.3" \ +ENV APP_VERSION="2.346.1" \ BITNAMI_APP_NAME="jenkins" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/git/bin:$PATH" diff --git a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 6f3eb2e5c591..cdca5f80d586 100644 --- a/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "git": { "arch": "amd64", - "digest": "c15ff3fff7478e74922d560c5c4ffcb8d11bff92975f81591b62742902edd731", + "digest": "75341efddd4113ca16df9815f6e015881c73f71c66c412a43e2ed7cc4fa7f177", "distro": "debian-11", "type": "NAMI", - "version": "2.36.1-150" + "version": "2.37.0-0" }, "gosu": { "arch": "amd64", @@ -22,10 +22,10 @@ }, "jenkins": { "arch": "amd64", - "digest": "89394cca5f34e4bd2ac6a4d813ccbd25bde411ff62b1208419e6ed82c4e94e36", + "digest": "23b49c9f7e9feb754f550fd93b7cc80be06de788ae1c3e081968d44ae8338f99", "distro": "debian-11", "type": "NAMI", - "version": "2.332.3-150" + "version": "2.346.1-0" }, "render-template": { "arch": "amd64", 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 c527d56af569..55666557e43f 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 @@ -34,6 +34,7 @@ jenkins_env_vars=( JENKINS_FORCE_HTTPS JENKINS_SKIP_BOOTSTRAP JENKINS_ENABLE_SWARM + JENKINS_KEYSTORE_PASSWORD JENKINS_USERNAME JENKINS_PASSWORD JENKINS_EMAIL @@ -91,6 +92,7 @@ export JENKINS_FORCE_HTTPS="${JENKINS_FORCE_HTTPS:-no}" JENKINS_SKIP_BOOTSTRAP="${JENKINS_SKIP_BOOTSTRAP:-"${DISABLE_JENKINS_INITIALIZATION:-}"}" export JENKINS_SKIP_BOOTSTRAP="${JENKINS_SKIP_BOOTSTRAP:-no}" # only used during the first initialization export JENKINS_ENABLE_SWARM="${JENKINS_ENABLE_SWARM:-no}" +export JENKINS_KEYSTORE_PASSWORD="${JENKINS_KEYSTORE_PASSWORD:-bitnami}" # Jenkins credentials export JENKINS_USERNAME="${JENKINS_USERNAME:-user}" # only used during the first initialization 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 6524e3d3db7d..838a4ce9f502 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 @@ -25,6 +25,8 @@ if is_boolean_yes "$JENKINS_FORCE_HTTPS"; then "--httpPort=-1" "--httpsPort=${JENKINS_HTTPS_PORT_NUMBER:-"$JENKINS_DEFAULT_HTTPS_PORT_NUMBER"}" "--httpsListenAddress=${JENKINS_HTTPS_LISTEN_ADDRESS:-"$JENKINS_DEFAULT_HTTPS_LISTEN_ADDRESS"}" + "--httpsKeyStore=${JENKINS_HOME}/jenkins.jks" + "--httpsKeyStorePassword=$JENKINS_KEYSTORE_PASSWORD" ) else args+=( @@ -32,6 +34,8 @@ else "--httpListenAddress=${JENKINS_HTTP_LISTEN_ADDRESS:-"$JENKINS_DEFAULT_HTTP_LISTEN_ADDRESS"}" "--httpsPort=${JENKINS_HTTPS_PORT_NUMBER:-"$JENKINS_DEFAULT_HTTPS_PORT_NUMBER"}" "--httpsListenAddress=${JENKINS_HTTPS_LISTEN_ADDRESS:-"$JENKINS_DEFAULT_HTTPS_LISTEN_ADDRESS"}" + "--httpsKeyStore=${JENKINS_HOME}/jenkins.jks" + "--httpsKeyStorePassword=$JENKINS_KEYSTORE_PASSWORD" ) fi args+=("$@") diff --git a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh index b1e55edfdc04..ea2813501316 100644 --- a/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh +++ b/bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh @@ -228,6 +228,8 @@ jenkins_initialize() { ! is_empty_value "$JENKINS_HOST" && jenkins_configure_host "$JENKINS_HOST" # Rotate the logs in Jenkins to clean the Jenkins warnings before actually configuring the app jenkins_stop + # Generate jenkins.jks + "${JAVA_HOME}/bin/keytool" -genkey -keypass "${JENKINS_KEYSTORE_PASSWORD}" -storepass "${JENKINS_KEYSTORE_PASSWORD}" -keystore "${JENKINS_HOME}/jenkins.jks" -dname "CN=${JENKINS_HOST}, O=${JENKINS_HOST}" -alias "${JENKINS_HOST}" mv "$JENKINS_LOG_FILE" "${JENKINS_LOGS_DIR}/jenkins.firstboot.log" rm "${JENKINS_HOME}/init.groovy.d/init-jenkins.groovy" else diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 593c7612d4cf..f531fe73a1f2 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`2`, `2-debian-11`, `2.332.3`, `2.332.3-debian-11-r6`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-jenkins/blob/2.332.3-debian-11-r6/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.346.1`, `2.346.1-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-jenkins/blob/2.346.1-debian-11-r0/2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/jenkins GitHub repo](https://github.com/bitnami/bitnami-docker-jenkins).