diff --git a/Dockerfile b/Dockerfile index e70a0adee3482c6ac34e7da0472f903b20e3dcca..8f868e1ee965d663b0f7b549d28d56ab203bfc37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -fsL ${JENKINS_URL}/login || exit 1 LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" -LABEL release=b91ce79ef06dbc1aafd7c750f19bc0083b6eca75 +LABEL release=39e96b82ab7adf049eac0aacdb3c432f51abaf1b LABEL version=2.263.1.2 ARG TARBALL=files.tar diff --git a/LICENSE.adoc b/LICENSE similarity index 100% rename from LICENSE.adoc rename to LICENSE diff --git a/download.json b/download.json index f0b9699dcabfd830ca75a4a8eaa83c203d820dfd..434ca9386adbc980096d80d3b9a933eee49f16c0 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-40a611ede95284e1911ac85801ab5f27a7f4402ba16d65e1d44d31ce59ae0854.tar", + "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-0aefab0f8d3d18886ab7e143939eeec200a193b7de109941346886993646ad14.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "40a611ede95284e1911ac85801ab5f27a7f4402ba16d65e1d44d31ce59ae0854" + "value": "0aefab0f8d3d18886ab7e143939eeec200a193b7de109941346886993646ad14" } } ] diff --git a/helm/requirements.lock b/helm/requirements.lock index cfe76842301480b6c8df7fa8efa996d4b122d93b..f0c0b3b427c08824f75c0b14dd81119a80716d33 100644 --- a/helm/requirements.lock +++ b/helm/requirements.lock @@ -9,4 +9,4 @@ dependencies: repository: https://charts.cloudbees.com/public/cloudbees version: 2.1.0 digest: sha256:b1cd3367672f5c35bdcff06f4a7d87f072f5f89f4e654a90aa199f3c1b939070 -generated: "2020-12-03T15:21:23.671272905Z" +generated: "2020-12-11T09:39:09.337984855Z" diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh index 570c61e20bdbbc60f09b6f5c6691f4f1a513ea20..0aaca5cba6b56a698f4f519780158c5d2be29d19 100644 --- a/scripts/usr/local/bin/jenkins.sh +++ b/scripts/usr/local/bin/jenkins.sh @@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \; # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then - eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=b91ce79ef06dbc1aafd7c750f19bc0083b6eca75 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=39e96b82ab7adf049eac0aacdb3c432f51abaf1b /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" fi # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image