UNCLASSIFIED

Commit 490c5bf3 authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master'

Merge Development into Master

See merge request !46
parents 9c11372a a066910e
Pipeline #316879 passed with stages
in 15 minutes and 34 seconds
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ubi8 ARG BASE_IMAGE=ubi8
ARG BASE_TAG=8.3 ARG BASE_TAG=8.4
FROM vault:1.7.1 AS source FROM vault:1.7.2 AS source
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -8,13 +8,13 @@ name: "hashicorp/vault/vault" ...@@ -8,13 +8,13 @@ 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.7.1" - "1.7.2"
- "latest" - "latest"
# 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:
...@@ -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.7.1" org.opencontainers.image.version: "1.7.2"
## 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.7.1 - tag: vault:1.7.2
url: docker://docker.io/library/vault@sha256:7d07d64480897215cca86ce51750c888fae4d703529708517ecdd5fabba6cbb3 url: docker://docker.io/library/vault@sha256:99d83f5179516576801b9a9411105a6b12c6195b7a1725da9fea47916df7305e
# 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