diff --git a/Dockerfile b/Dockerfile index dc80799ebb559afeb20dd7d362df9124a8d7c61d..b89e9cbfd202f364ecbd26ebbb219f43add78f50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,21 +4,12 @@ ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} MAINTAINER terrana_steven@bah.com -### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels -LABEL name="Solutions Delivery Platform: Helm" \ - maintainer="terrana_steven@bah.com" \ - vendor="Booz Allen Hamilton" \ - version="1.0" \ - release="1.0" \ - summary="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" \ - description="A container used by the openshift and kubernetes libraries within the Solutions Delivery Platform" - ### add licenses to this directory COPY LICENSE /licenses ARG OC_VERSION=v3.11.0 -ARG HELM_VERSION=v3.4.1 -ARG KUBECTL_VERSION=v1.19.0 +ARG HELM_VERSION=v3.5.2 +ARG KUBECTL_VERSION=v1.20.0 ARG user=sdp ARG group=sdp ARG uid=1000 @@ -33,7 +24,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.7.tar.gz +ARG TARBALL=helm-dependencies-dcar-1.8.tar.gz RUN mkdir /root/tmp COPY ./${TARBALL} /root/tmp diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7985b3798c95c4d60331856c0c72b0ddbc4e3faa..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "3.4.1") diff --git a/README.md b/README.md index 44d27fb7135db9c7cca0f0c2fbbb2683681372ff..b68fda34945ca5a1e15774a6d8696aa645fb1be8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Openshift Helm Container Application Version 3.4.1 +# Openshift Helm Container Application Version 3.5.2 ## Introduction This container hosts the OpenShift Helm application to be used as part of the Solution Delivery Platform. @@ -11,8 +11,8 @@ 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.4.1) -ARG KUBECTL_VERSION = version of the Kubectl application used in the container (v1.19.0) +ARG HELM_VERSION = version of the Helm application used in the container (v3.5.2) +ARG KUBECTL_VERSION = version of the Kubectl application used in the container (v1.20.0) ARG user = non-root user name ARG group = non-root user group name ARG uid = non-root user id (1000 by default) diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 1814e1ebe9a35f39ce22d3bd4ec48aff875d8af7..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resources: - - url: "https://github.com/boozallen/sdp-images/releases/download/dcar-1.7/helm-dependencies-dcar-1.7.tar.gz" - filename: "helm-dependencies-dcar-1.7.tar.gz" # [required field] desired staging name for the build context - validation: - type: "sha256" # supported: sha256, sha1, sha224, sha512, PGP - value: "a68209d455917dec1c76bee1f88e92b8b4942a4f64f204fc34715e8ff56dda8a" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9645c70d446b4579c42a6113ec49f7efba2fc74a --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "solutions-delivery-platform/openshift/helm" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "3.5.2" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" + +# Docker image labels +labels: + org.opencontainers.image.title: "helm" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Contains helm, kubectl, and oc applications for Kubernetes management via CLI" + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "Booz Allen Public License v1.0" + ## URL to find more information on the image + 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.5.2" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "SDP, helm, kubectl, oc, kubernetes, openshift" + ## This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "opensource" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "Solutions Delivery Platform" + +# List of resources to make available to the offline build context +resources: +- filename: helm-dependencies-dcar-1.8.tar.gz + url: https://github.com/boozallen/sdp-images/releases/download/dcar-1.8/helm-dependencies-dcar-1.8.tar.gz + validation: + type: sha256 + value: 0740d1eded0d544bc3612117671cf8024aba066ee6fcf9d007491318541c9bed + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "spicer_casey@bah.com" +# # The name of the current container owner + name: "Casey Spicer" +# # The gitlab username of the current container owner + username: "cspicer" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +- name: "Al Fontaine" + username: "alfontaine" + email: "alan.fontaine@centauricorp.com"