UNCLASSIFIED

Skip to content

GitLab

Commit e7783a66 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch '2.263.1.2' into 'development' 

2.263.1.2

See merge request !39
parents d448b46a 446c3f65
Pipeline #110812 passed with stages
in 28 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ e7783a66
...@@ -42,7 +42,7 @@ HEALTHCHECK --interval=5m --timeout=3s \ ...@@ -42,7 +42,7 @@ HEALTHCHECK --interval=5m --timeout=3s \
CMD curl -fsL ${JENKINS_URL}/login || exit 1 CMD curl -fsL ${JENKINS_URL}/login || exit 1
LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
LABEL release=b91ce79ef06dbc1aafd7c750f19bc0083b6eca75 LABEL release=39e96b82ab7adf049eac0aacdb3c432f51abaf1b
LABEL version=2.263.1.2 LABEL version=2.263.1.2
ARG TARBALL=files.tar ARG TARBALL=files.tar
......
download.json
View file @ e7783a66
{ {
"resources": [ "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", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "40a611ede95284e1911ac85801ab5f27a7f4402ba16d65e1d44d31ce59ae0854" "value": "0aefab0f8d3d18886ab7e143939eeec200a193b7de109941346886993646ad14"
} }
} }
] ]
......
helm/requirements.lock
View file @ e7783a66
...@@ -9,4 +9,4 @@ dependencies: ...@@ -9,4 +9,4 @@ dependencies:
repository: https://charts.cloudbees.com/public/cloudbees repository: https://charts.cloudbees.com/public/cloudbees
version: 2.1.0 version: 2.1.0
digest: sha256:b1cd3367672f5c35bdcff06f4a7d87f072f5f89f4e654a90aa199f3c1b939070 digest: sha256:b1cd3367672f5c35bdcff06f4a7d87f072f5f89f4e654a90aa199f3c1b939070
generated: "2020-12-03T15:21:23.671272905Z" generated: "2020-12-11T09:39:09.337984855Z"
scripts/usr/local/bin/jenkins.sh
View file @ e7783a66
...@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \; ...@@ -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 `docker run` first argument start with `--` the user is passing jenkins launcher arguments
if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then 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 fi
# As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED