UNCLASSIFIED

Commit 4e626658 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

master: bump ubi

See merge request !18
parents f1b72220 37b383d9
Pipeline #467293 failed with stages
in 7 minutes and 3 seconds
############################################################### 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/citadel:1.5.10 AS base FROM istio/citadel: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/istio_ca /usr/local/bin/istio_ca COPY --from=base /usr/local/bin/istio_ca /usr/local/bin/istio_ca
RUN dnf update -y && \ RUN dnf update -y && \
dnf clean all && \ dnf clean all && \
...@@ -15,4 +12,4 @@ RUN dnf update -y && \ ...@@ -15,4 +12,4 @@ RUN dnf update -y && \
USER 1001 USER 1001
ENTRYPOINT [ "/usr/local/bin/istio_ca", "--self-signed-ca" ] ENTRYPOINT [ "/usr/local/bin/istio_ca", "--self-signed-ca" ]
\ No newline at end of file
...@@ -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