From b943b91828c76b9c1691795c1679646e9fb78259 Mon Sep 17 00:00:00 2001 From: Olga O Date: Thu, 29 Jul 2021 12:28:18 -0500 Subject: [PATCH 1/3] update tag --- Dockerfile | 4 ++-- hardening_manifest.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92e4264..518b83b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=redhat/openjdk/openjdk8-devel ARG BASE_TAG=1.8.0 -FROM jenkins/jenkins:2.289.2-centos as jenkins +FROM jenkins/jenkins:2.289.3-centos as jenkins FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -72,6 +72,6 @@ COPY scripts/jenkins-plugin-cli.sh /bin/jenkins-plugin-cli HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD curl -I -f --max-time 5 http://localhost:8080/login?from=%2F || exit 1 -ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] +# ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] # from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup $REF/plugins from a support bundle diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 2d4ce4d..ae47038 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkins" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "2.289.2" +- "2.289.3" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://www.jenkins.io/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "jenkins" - org.opencontainers.image.version: "2.289.2" + org.opencontainers.image.version: "2.289.3" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "cicd" ## This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -- url: "docker://docker.io/jenkins/jenkins@sha256:a9cf9e95587179d843e1e9817ac2c1246c44935d5b8222b3a742114ffd88fc9a" - tag: "jenkins/jenkins:2.289.2-centos" +- url: "docker://docker.io/jenkins/jenkins@sha256:e3b5c5547dec8068f89ef2a8c7615f038b52844ecc77a2cda4f9897bc42c3d9a" + tag: "jenkins/jenkins:2.289.3-centos" - filename: jenkins-plugin-manager.jar url: https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.0/jenkins-plugin-manager-2.10.0.jar validation: -- GitLab From a05335c07873120974c49d6cd5158be647806886 Mon Sep 17 00:00:00 2001 From: Olga O Date: Thu, 29 Jul 2021 13:10:32 -0500 Subject: [PATCH 2/3] update tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 518b83b..abb972c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ENV JENKINS_HOME $JENKINS_HOME ENV JENKINS_SLAVE_AGENT_PORT ${agent_port} ENV REF $REF -COPY --from=jenkins /usr/bin/git-lfs /usr/bin/git-lfs +COPY --from=jenkins /usr/local/bin/git-lfs /usr/local/bin/git-lfs # Jenkins is run with user `jenkins`, uid = 1000 # If you bind mount a volume from the host or a data container, -- GitLab From f180ed4acea651ba93066cf8cb7939cd9f266c19 Mon Sep 17 00:00:00 2001 From: Olga O Date: Thu, 29 Jul 2021 13:42:03 -0500 Subject: [PATCH 3/3] update tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index abb972c..2e3bb71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,6 @@ COPY scripts/jenkins-plugin-cli.sh /bin/jenkins-plugin-cli HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD curl -I -f --max-time 5 http://localhost:8080/login?from=%2F || exit 1 -# ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] +ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] # from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup $REF/plugins from a support bundle -- GitLab