diff --git a/Dockerfile b/Dockerfile index 74c76eceb7fdabe739e9e94bc57fd72980b91503..c4b2130a384985a4879cc6df5bcfc8ea51666898 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,9 @@ RUN INSTALL_PKGS="tar hostname device-mapper-persistent-data lvm2 git openssl sc --setopt=tsflags=nodocs ### Install your application here -- add all other necessary items to build your image -ENV JENKINS_AGENT_VERSION dcar-2.0 -ENV JENKINS_SWARM_VERSION 3.25 -ENV JNLP_SLAVE_VERSION 4.8 +ENV JENKINS_AGENT_VERSION dcar-2.1 +ENV JENKINS_SWARM_VERSION 3.27 +ENV JNLP_SLAVE_VERSION 4.10 ENV HOME /root ENV JAVA_HOME /usr/lib/jvm/java ARG TARBALL=jenkins-agent-dependencies-${JENKINS_AGENT_VERSION} diff --git a/README.md b/README.md index 9a934ca62dfc6ccfe79d0a9f51c16640626aa027..a95eba737676896a6ce90f3275899b1679491734 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Jenkins Agent Container Application Version 3.25 +# Jenkins Agent Container Application Version 3.27 ## **IMPORTANT SECURITY ALERT** @@ -17,15 +17,15 @@ ARG BASE_IMAGE = defines the image portion of the OS image to be used ARG BASE_TAG = defines the tag portion of the OS image to be used in the FROM command. ENV JENKINS_AGENT_VERSION = defines dependency label -ENV JENKINS_SWARM_VERSION = defines application version of Jenkins Swarm (3.25) -ENV JNLP_SLAVE_VERSION = defines application version of JNLP Slave (4.8). +ENV JENKINS_SWARM_VERSION = defines application version of Jenkins Swarm (3.27) +ENV JNLP_SLAVE_VERSION = defines application version of JNLP Slave (4.10). ENV HOME = defines the starting location folder upon startup. ENV JAVA_HOME = defines the location of which java to use. ARG TARBALL = defines the name of the dependency bundle to unpack and install applications from. ``` ## Notes -When building the container image, feel free to alter the BASE_REGISTRY, BASE_IMAGE, and BASE_TAG variables to load an appropriate OS image. By default, an UBI8.2 image will be used. +When building the container image, feel free to alter the BASE_REGISTRY, BASE_IMAGE, and BASE_TAG variables to load an appropriate OS image. By default, an UBI8.4 image will be used. When running the container ensure the Jenkins container is running first, otherwise there are no special considerations to be taken when running the container image. By default, the sonar scanner application is set to run at startup. To explicitly start the supervisord application at runtime use: ``` podman run CMD supervisord --configuration /etc/supervisor/conf.d/supervisord.conf diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a59d30c359d3f388b6c9f78326b672849250f94a..a76929ef73c7f1355d3dbfac690b2795a96eba8c 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "solutions-delivery-platform/jenkins-agent/jenkins-agent" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "3.25" +- "3.27" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://github.com/boozallen/sdp-images" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Booz Allen Hamilton" - org.opencontainers.image.version: "3.25" + org.opencontainers.image.version: "3.27" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "Jenkins, agent, jenkins-agent, automation, server, CI/CD, ci, cd, pipeline" ## This value can be "opensource" or "commercial" @@ -37,11 +37,11 @@ labels: # List of resources to make available to the offline build context resources: -- filename: jenkins-agent-dependencies-dcar-2.0.tar.gz - url: https://github.com/boozallen/sdp-images/releases/download/dcar-2.0/jenkins-agent-dependencies-dcar-2.0.tar.gz +- filename: jenkins-agent-dependencies-dcar-2.1.tar.gz + url: https://github.com/boozallen/sdp-images/releases/download/dcar-2.1/jenkins-agent-dependencies-dcar-2.1.tar.gz validation: type: sha256 - value: dc2d4c21f6939758a0ca9814ffcca73f02f69188e303033ec5398eb4cdfd4405 + value: ee98da7a546cbbb6424ff63ddfd83187733be73058ce902ae9367ebba6f788a1 # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist