UNCLASSIFIED

Skip to content

GitLab

Commit 9c831b2e authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master' 

Merge Development into Master

See merge request !17
parents 0230d753 fe2b9419
Pipeline #466985 failed with stages
in 15 minutes and 2 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Dockerfile
View file @ 9c831b2e
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.3 ARG BASE_TAG=8.4
FROM amazon/aws-controllers-k8s:s3-v0.0.1 AS builder FROM amazon/aws-controllers-k8s:s3-v0.0.1 AS builder
...@@ -16,4 +16,4 @@ USER awscontrollersk8suser ...@@ -16,4 +16,4 @@ USER awscontrollersk8suser
ENTRYPOINT ["/bin/controller"] ENTRYPOINT ["/bin/controller"]
HEALTHCHECK NONE HEALTHCHECK NONE
\ No newline at end of file
hardening_manifest.yaml
View file @ 9c831b2e
...@@ -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