public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[bitnami/jenkins] Release 2.401.2-debian-11-r21 (#41619) 

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2023-07-20 21:11:40 +02:00 committed by GitHub
parent 68337e93aa
commit ef7a9cff70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitnami/jenkins/2/debian-11/Dockerfile
View File

@ -6,11 +6,12 @@ FROM docker.io/bitnami/minideb:bullseye
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-07-14T12:07:05Z" \
LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-07-19T19:57:13Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="2.401.2-debian-11-r7" \
org.opencontainers.image.ref.name="2.401.2-debian-11-r21" \
org.opencontainers.image.title="jenkins" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="2.401.2"
@ -27,7 +28,7 @@ RUN install_packages ca-certificates curl fontconfig git jq libfontconfig1 opens
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \
"java-11.0.19-7-2-linux-${OS_ARCH}-debian-11" \
"java-17.0.7-7-2-linux-${OS_ARCH}-debian-11" \
"jenkins-2.401.2-1-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \

2
bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@ -3,7 +3,7 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "11.0.19-7-2"
"version": "17.0.7-7-2"
},
"jenkins": {
"arch": "amd64",

40
bitnami/jenkins/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
View File

@ -187,6 +187,25 @@ validate_port() {
fi
}
########################
# Validate if the provided argument is a valid IPv6 address
# Arguments:
# $1 - IP to validate
# Returns:
# Boolean
#########################
validate_ipv6() {
local ip="${1:?ip is missing}"
local stat=1
local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
stat=0
fi
return "$stat"
}
########################
# Validate if the provided argument is a valid IPv4 address
# Arguments:
@ -204,7 +223,26 @@ validate_ipv4() {
&& ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
stat=$?
fi
return $stat
return "$stat"
}
########################
# Validate if the provided argument is a valid IPv4 or IPv6 address
# Arguments:
# $1 - IP to validate
# Returns:
# Boolean
#########################
validate_ip() {
local ip="${1:?ip is missing}"
local stat=1
if validate_ipv4 "$ip"; then
stat=0
else
stat=$(validate_ipv6 "$ip")
fi
return "$stat"
}
########################

2
bitnami/jenkins/2/debian-11/rootfs/opt/bitnami/scripts/libjenkins.sh
View File

@ -229,7 +229,7 @@ jenkins_initialize() {
# 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_CERTS_DIR}/jenkins.jks" -dname "CN=${JENKINS_HOST}, O=${JENKINS_HOST}" -alias "${JENKINS_HOST}"
"${JAVA_HOME}/bin/keytool" -genkey -keyalg RSA -keypass "${JENKINS_KEYSTORE_PASSWORD}" -storepass "${JENKINS_KEYSTORE_PASSWORD}" -keystore "${JENKINS_CERTS_DIR}/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