diff --git a/Dockerfile b/Dockerfile index 73c8f404c06bce07ef16c460eab1182c374ed177..7f0fb539cd5713a8545cdd359c652456623b8fd7 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.3 +ARG HELM_VERSION=v3.3.0 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.2.tar.gz +ARG TARBALL=helm-dependencies-dcar-1.4.tar.gz RUN mkdir /root/tmp COPY ./${TARBALL} /root/tmp diff --git a/Jenkinsfile b/Jenkinsfile index cabc31b3358b0598753218b87bbfb8cf7ab28539..f7de82d99e9cc803c1b5fb8fca25b5653a2746d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "3.2.3") +dccscrPipeline(version: "3.3.0") diff --git a/README.md b/README.md index fd80fd0da1f7ba99c273565bd3d647740a873ff8..fd333d0f355c42c2c04d3c48eef8fb1a6b5d8bec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Openshift Helm Container Application Version 3.2.3 +# Openshift Helm Container Application Version 3.3.0 ## Introduction This container hosts the OpenShift Helm application to be used as part of the Solution Delivery Platform. @@ -11,7 +11,7 @@ ARG BASE_REGISTRY = defines the registry portion of the OS image to be u ARG BASE_IMAGE = defines the image portion of the OS image to be used in the FROM command. ARG BASE_TAG = defines the tag portion of the OS image to be used in the FROM command. ARG OC_VERSION = version of the OpenShift Client application used in the container (v3.11.0) -ARG HELM_VERSION = version of the Helm application used in the container (v3.2.1) +ARG HELM_VERSION = version of the Helm application used in the container (v3.3.0) ARG KUBECTL_VERSION = version of the Kubectl application used in the container (v1.18.0) ARG user = non-root user name ARG group = non-root user group name diff --git a/download.yaml b/download.yaml index 569d15f8c14f3fc6102159a3fdf3ffb027210309..834ef2a9e7340b9d95b78143839953e0f4d3acc5 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - 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 + - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.4/helm-dependencies-dcar-1.4.tar.gz" + filename: "helm-dependencies-dcar-1.4.tar.gz" # [required field] desired staging name for the build context validation: type: "sha256" # supported: sha256, sha1, sha224, sha512, PGP - value: "4c3e377a746823b02bf17e0ab3b72d87b927828e9dbfe10498402681c065f04c" + value: "024373a86653eeebb4a94804bad37f03ae44fd51d07a7fa471f74f3ce9e75a87"