UNCLASSIFIED

Skip to content

GitLab

Commit a410929d authored by riveraj's avatar riveraj
Browse files

Merge branch 'development' into 'master' 

Merge Development branch to Master branch

See merge request !19
parents c48dc20b 50145007
Pipeline #467297 failed with stages
in 15 minutes and 53 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
Dockerfile
View file @ a410929d
############################################################### 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/node-agent-k8s:1.5.10 AS base FROM istio/node-agent-k8s:1.5.10 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
COPY --from=base node_agent_k8s / COPY --from=base node_agent_k8s /
RUN dnf update -y && \ RUN dnf update -y && \
...@@ -16,4 +13,4 @@ RUN dnf update -y && \ ...@@ -16,4 +13,4 @@ RUN dnf update -y && \
rm -rf /var/cache/dnf/ rm -rf /var/cache/dnf/
USER 1001 USER 1001
ENTRYPOINT ["/node_agent_k8s"] ENTRYPOINT ["/node_agent_k8s"]
\ No newline at end of file
hardening_manifest.yaml
View file @ a410929d
...@@ -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