UNCLASSIFIED

Commit 8acdd589 authored by Al Fontaine's avatar 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
...@@ -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}
......
...@@ -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:e2fedbd8dadb71d909c7f989c8182b82052107aeb09f62ec18e5fb24fc622c53 url: docker://docker.io/library/vault@sha256:8c988769b7857a76c572beb69f836867b6b1897099aaa2e85c1eed63f8cb19ab
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
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