UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Ironbank Containers
M
MITRE
SAF
heimdall2
Commits
1e94077f
Commit
1e94077f
authored
May 26, 2021
by
Ryan Akers
Browse files
Merge branch 'heimdall2.4.6' into 'development'
Upgrade to Heimdall 2.4.6 See merge request
!16
parents
f5a2694a
2df09749
Pipeline
#279750
passed with stages
in 32 minutes and 3 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
Dockerfile
Dockerfile
+2
-2
hardening_manifest.yaml
hardening_manifest.yaml
+5
-5
No files found.
Dockerfile
View file @
1e94077f
ARG
BASE_REGISTRY=registry1.dso.mil
ARG
BASE_IMAGE=ironbank/opensource/nodejs/nodejs14
ARG
BASE_TAG=14.1
6
.0
ARG
BASE_TAG=14.1
7
.0
FROM
mitre/heimdall2:version-2.4.
5
AS source
FROM
mitre/heimdall2:version-2.4.
6
AS source
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
...
hardening_manifest.yaml
View file @
1e94077f
...
...
@@ -8,13 +8,13 @@ name: "mitre/saf/heimdall2"
# The most specific version should be the first tag and will be shown
# on ironbank.dso.mil
tags
:
-
"
2.4.
5
"
-
"
2.4.
6
"
-
"
latest"
# Build args passed to Dockerfile ARGs
args
:
BASE_IMAGE
:
"
opensource/nodejs/nodejs14"
BASE_TAG
:
"
14.1
6
.0"
BASE_TAG
:
"
14.1
7
.0"
# Docker image labels
labels
:
...
...
@@ -29,7 +29,7 @@ labels:
# Name of the distributing entity, organization or individual
org.opencontainers.image.vendor
:
"
MITRE"
# Authoritative version of the software
org.opencontainers.image.version
:
"
2.4.
5
"
org.opencontainers.image.version
:
"
2.4.
6
"
# Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords
:
"
saf"
# This value can be "opensource" or "commercial"
...
...
@@ -47,8 +47,8 @@ resources:
value
:
7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e
# This is the official upstream docker image of Heimdall2
-
tag
:
mitre/heimdall2:version-2.4.
5
url
:
docker://docker.io/mitre/heimdall2@sha256:
d7646e1630677ebae1025b66620f714368495783d0d0e11fe0a281afb0496790
-
tag
:
mitre/heimdall2:version-2.4.
6
url
:
docker://docker.io/mitre/heimdall2@sha256:
9253d4cbb8ee6a08147e0bb4ce2b87232719cca73014fb367e6925d3e481e00c
# List of project maintainers
maintainers
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment