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
H
Hashicorp
vault
vault
Commits
8acdd589
Commit
8acdd589
authored
Mar 09, 2021
by
Al Fontaine
Browse files
Merge branch 'development' into 'master'
bump 1.6.3 See merge request
!34
parents
29de5cf0
d8f403d9
Pipeline
#193109
failed with stages
in 53 seconds
Changes
2
Pipelines
4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Dockerfile
Dockerfile
+1
-1
hardening_manifest.yaml
hardening_manifest.yaml
+4
-4
No files found.
Dockerfile
View file @
8acdd589
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG
BASE_IMAGE=ubi8
ARG
BASE_IMAGE=ubi8
ARG
BASE_TAG=8.3
ARG
BASE_TAG=8.3
FROM
vault:1.6.
1
AS source
FROM
vault:1.6.
3
AS source
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
...
hardening_manifest.yaml
View file @
8acdd589
...
@@ -8,7 +8,7 @@ name: "hashicorp/vault/vault"
...
@@ -8,7 +8,7 @@ name: "hashicorp/vault/vault"
# The most specific version should be the first tag and will be shown
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
# on ironbank.dsop.io
tags
:
tags
:
-
"
1.6.
1
"
-
"
1.6.
3
"
-
"
latest"
-
"
latest"
# Build args passed to Dockerfile ARGs
# Build args passed to Dockerfile ARGs
...
@@ -27,7 +27,7 @@ labels:
...
@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url
:
"
https://www.vaultproject.io/"
org.opencontainers.image.url
:
"
https://www.vaultproject.io/"
## Name of the distributing entity, organization or individual
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor
:
"
Hashicorp"
org.opencontainers.image.vendor
:
"
Hashicorp"
org.opencontainers.image.version
:
"
1.6.
1
"
org.opencontainers.image.version
:
"
1.6.
3
"
## Keywords to help with search (ex. "cicd,gitops,golang")
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords
:
"
opensource"
mil.dso.ironbank.image.keywords
:
"
opensource"
## This value can be "opensource" or "commercial"
## This value can be "opensource" or "commercial"
...
@@ -37,8 +37,8 @@ labels:
...
@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context
# List of resources to make available to the offline build context
resources
:
resources
:
-
tag
:
vault:1.6.
1
-
tag
:
vault:1.6.
3
url
:
docker://docker.io/library/vault@sha256:
e2fedbd8dadb71d909c7f989c8182b82052107a
eb
0
9f
62ec18e5fb24fc622c53
url
:
docker://docker.io/library/vault@sha256:
8c988769b7857a76c572b
eb
6
9f
836867b6b1897099aaa2e85c1eed63f8cb19ab
# List of project maintainers
# List of project maintainers
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