diff --git a/Dockerfile b/Dockerfile index 42e790624a94f83b555f337ac06ae03425b2a42b..f160374c0a51d59f9fe7bcbe0b65bc0f5b8c6c92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -ARG BASE_REGISTRY=registry.access.redhat.com -ARG BASE_IMAGE=ubi8/ubi -ARG BASE_TAG=8.1 +ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 +ARG BASE_IMAGE=redhat/ubi/ubi7 +ARG BASE_TAG=7.8 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + MAINTAINER terrana_steven@bah.com ### Required Atomic/OpenShift Labels - https://github.com/projectatomic/ContainerApplicationGenericLabels @@ -19,6 +20,7 @@ COPY LICENSE /licenses ARG OC_VERSION=v3.11.0 ARG HELM_VERSION=v2.15.2 ARG KUBECTL_VERSION=v1.14.7 + ARG user=sdp ARG group=sdp ARG uid=1000 @@ -32,7 +34,7 @@ RUN mkdir -p $SDP_HOME \ ARG TARBALL=helm-dependencies-dcar-0.5.tar.gz RUN mkdir /root/tmp -COPY ./${TARBALL} /root/tmp +COPY ./${TARBALL} /root/tmp/. ###Unpack tarball containing dependencies && place files into needed locations RUN cd /root/tmp && tar -zxf ./${TARBALL} && rm -fv ./${TARBALL} && \ diff --git a/Jenkinsfile b/Jenkinsfile index ed5c85307e532d976d0c5aa64c32b75315aabe33..51146a44994ffcb755de4cfcbc02b250c594a754 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "2.15.2") +dccscrPipeline(version: "ubi7-helm-2.15.2") diff --git a/README.md b/README.md index 4c0b2212442844b0277bb22a1572755fbb94a7de..364aa3e9635c507f6af37fe14514076d1ef422d2 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,15 @@ ARG group = non-root user group name ARG uid = non-root user id (1000 by default) ARG gid = non-root user group id (1000 by default) ARG SDP_HOME = establishes PATH for user home directory (EX: /home/sdp_home) +ARG TARBALL = name of the tarball dependency bundle containing the applications to install ``` ## 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.1 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 UBI7 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: ``` docker run helm && oc && kubectl ``` -## Recommended resources for the image: +## 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. diff --git a/download.json b/download.json index 1e3744426650d07cd062d5eb7ed294bdffb1de64..a84b776e9476a772c916e657b16a9eb822923529 100644 --- a/download.json +++ b/download.json @@ -1,8 +1,8 @@ { "resources": [ - { "url" : "https://github.com/boozallen/sdp-images/releases/tag/dcar-0.5", + { "url" : "https://github.com/boozallen/sdp-images/releases/download/dcar-0.5/helm-dependencies-dcar-0.5.tar.gz", "filename": "helm-dependencies-dcar-0.5.tar.gz", - "sha256": "7bfc68949e910efa9c8d7b35e42d27caf5634738847e4f20e1ac27aee956572b" + "sha256": "a1255aeda4dacc3b0abecd90c3e421a17abfcdca21ff5a05c1c0374703f85c43" } ] }