UNCLASSIFIED

Skip to content

GitLab

Commit c9e5f6b0 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master' 

master: bump ubi

See merge request !18
parents 4b0bf105 cb60455a
Pipeline #467295 failed with stages
in 14 minutes and 21 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
Dockerfile
View file @ c9e5f6b0
############################################################### 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=8.4
ARG BASE_IMAGE=redhat/ubi/ubi8
ARG BASE_TAG=8.2
FROM istio/galley:1.5.10 AS base FROM istio/galley: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/ /usr/local/bin/ COPY --from=base /usr/local/bin/ /usr/local/bin/
RUN dnf update -y && \ RUN dnf update -y && \
dnf clean all && \ dnf clean all && \
......
hardening_manifest.yaml
View file @ c9e5f6b0
...@@ -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