UNCLASSIFIED

Skip to content

GitLab

Commit a10f1356 authored by riveraj's avatar riveraj
Browse files

Merge branch 'development' into 'master' 

Merge Development branch to Master branch

See merge request !17
parents 8afd6531 27e8ba1a
Pipeline #467298 failed with stages
in 13 minutes and 14 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
Dockerfile
View file @ a10f1356
############################################################### ARG BASE_REGISTRY=registry1.dso.mil
# Default registry variables ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_TAG=latest
ARG BASE_IMAGE=redhat/ubi/ubi8
ARG BASE_TAG=8.2
FROM istio/istioctl:1.5.10 AS base FROM istio/istioctl:1.5.10 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
COPY --from=base /usr/local/bin/istioctl /usr/local/bin/istioctl COPY --from=base /usr/local/bin/istioctl /usr/local/bin/istioctl
USER 1000 USER 1000
......
hardening_manifest.yaml
View file @ a10f1356
...@@ -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