UNCLASSIFIED

Skip to content

GitLab

Commit a4a07000 authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master' 

Merge Development into Master

See merge request !24
parents 55e059f9 68051935
Pipeline #354268 passed with stages
in 26 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Dockerfile
View file @ a4a07000
######################## Base Args ######################## ######################## Base Args ########################
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.3 ARG BASE_TAG=8.4
ARG UBI_BASE_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ARG UBI_BASE_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ a4a07000
...@@ -14,7 +14,7 @@ tags: ...@@ -14,7 +14,7 @@ tags:
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "redhat/ubi/ubi8" BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.3" BASE_TAG: "8.4"
# Docker image labels # Docker image labels
labels: labels:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED