UNCLASSIFIED

Skip to content

GitLab

Commit 45e8d26c authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master' 

Development

See merge request !86
parents 35445ef4 034c8aef
Pipeline #416820 canceled with stages
in 12 minutes and 52 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Dockerfile
View file @ 45e8d26c
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/opensource/ruby/ruby26 ARG BASE_IMAGE=ironbank/opensource/ruby/ruby26
ARG BASE_TAG=2.6.7 ARG BASE_TAG=2.6.8
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER 0 USER 0
......
hardening_manifest.yaml
View file @ 45e8d26c
...@@ -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: "opensource/ruby/ruby26" BASE_IMAGE: "opensource/ruby/ruby26"
BASE_TAG: "2.6.7" BASE_TAG: "2.6.8"
# 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