From 14fc9c42b6ae5ea03d6e1a60593a0db349dba3da Mon Sep 17 00:00:00 2001 From: imontero Date: Tue, 15 Sep 2020 12:18:43 +0000 Subject: [PATCH] 2.249.1.2 --- Dockerfile | 2 +- download.json | 4 ++-- helm/requirements.lock | 2 +- scripts/usr/local/bin/jenkins.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 809b26a..7009789 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=578ba7dd71a9cad51049e8b57f3efa461511d9fe +LABEL release=da3edc0598625e4129f5562827921449394afb42 LABEL version=2.249.1.2 ARG TARBALL=files.tar diff --git a/download.json b/download.json index a9e6e8f..0b5fd41 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-89f86c15ad29c7a4199c0207373d405f7b93c331bdedd0944edc642f637dac99.tar", + "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-1a4963e50dd445eb045a63c87c52b02a7b2abdf64d5c048398943ed818186f30.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "89f86c15ad29c7a4199c0207373d405f7b93c331bdedd0944edc642f637dac99" + "value": "1a4963e50dd445eb045a63c87c52b02a7b2abdf64d5c048398943ed818186f30" } } ] diff --git a/helm/requirements.lock b/helm/requirements.lock index 5b80b12..83131d0 100644 --- a/helm/requirements.lock +++ b/helm/requirements.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.cloudbees.com/public/cloudbees version: 2.0.6 digest: sha256:d030d7cde88b3247e6924bbd0dd3c00e5708edbe6fae2bdba9ed7eaa9ca2cc24 -generated: "2020-09-10T06:07:30.330950229Z" +generated: "2020-09-15T12:13:54.481668733Z" diff --git a/scripts/usr/local/bin/jenkins.sh b/scripts/usr/local/bin/jenkins.sh index 1419216..f9061e5 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=578ba7dd71a9cad51049e8b57f3efa461511d9fe /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" + eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=da3edc0598625e4129f5562827921449394afb42 /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 -- GitLab