diff --git a/Dockerfile b/Dockerfile index b3d852ae49c98106909d7888daa369aa9dc32289..73c8f404c06bce07ef16c460eab1182c374ed177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ LABEL name="Solutions Delivery Platform: Helm" \ COPY LICENSE /licenses ARG OC_VERSION=v3.11.0 -ARG HELM_VERSION=v3.2.1 +ARG HELM_VERSION=v3.2.3 ARG KUBECTL_VERSION=v1.18.0 ARG user=sdp ARG group=sdp @@ -33,7 +33,7 @@ RUN mkdir -p $SDP_HOME \ && groupadd -g ${gid} ${group} \ && useradd -d "$SDP_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user} -ARG TARBALL=helm-dependencies-dcar-1.1.tar.gz +ARG TARBALL=helm-dependencies-dcar-1.2.tar.gz RUN mkdir /root/tmp COPY ./${TARBALL} /root/tmp diff --git a/Jenkinsfile b/Jenkinsfile index 51ddc45cebf3a0587ba4a8e418259a6521d1b370..cabc31b3358b0598753218b87bbfb8cf7ab28539 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "3.2.1") +dccscrPipeline(version: "3.2.3") diff --git a/README.md b/README.md index 3a5dda319d30e956c479fec9fbdb61520b170532..fd80fd0da1f7ba99c273565bd3d647740a873ff8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Openshift Helm Container Application Version 3.2.1 +# Openshift Helm Container Application Version 3.2.3 ## Introduction This container hosts the OpenShift Helm application to be used as part of the Solution Delivery Platform. @@ -23,10 +23,17 @@ ARG TARBALL = name of the tarball dependency bundle containing the ## 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. -No special considerations to be taken when running the container image. By default no applications start at runtime and will have to be started by using the container CLI or explicitly calling each application at runtime. To explicitly start the Helm, OpenShift Client, and Kubectl applications at runtime use: +No special considerations to be taken when running the container image. The image is intended to be utilized by a Jenkins Agent container, but can be used manually. By default no applications start at runtime and will have to be started by using the container CLI or explicitly calling each application at runtime. To explicitly use the Helm, OpenShift Client, and Kubectl applications use: ``` -docker run helm && oc && kubectl +docker run /bin/bash +#Inside the container use commands + helm --help + oc --help + kubectl --help ``` ## Recommended resources for the image System requirements, including memory and CPU, will be derived from the Jenkins Agent Container as this container will be running inside of the Jenkins Agent Container. Default image size of the Helm container is 528 MB, subject to change if OS base image is changed. One container instance and storage volume is sufficient for base operations. + +## SDP +To learn more about the Solutions Delivery Platform please visit https://boozallen.github.io/sdp-docs/overview/1/index.html diff --git a/download.yaml b/download.yaml index 4d23ccaf9bd13dd0e85f03fc7c681827c759e6ff..569d15f8c14f3fc6102159a3fdf3ffb027210309 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.1/helm-dependencies-dcar-1.1.tar.gz" - filename: "helm-dependencies-dcar-1.1.tar.gz" # [required field] desired staging name for the build context + - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.2/helm-dependencies-dcar-1.2.tar.gz" + filename: "helm-dependencies-dcar-1.2.tar.gz" # [required field] desired staging name for the build context validation: type: "sha256" # supported: sha256, sha1, sha224, sha512, PGP - value: "185c15a954cc13b582d9483912083619f229c1565a296c191ecbaab8aa29f21e" + value: "4c3e377a746823b02bf17e0ab3b72d87b927828e9dbfe10498402681c065f04c"