UNCLASSIFIED

Commit d630d0cc authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master'

Merge Development into Master

See merge request !26
parents 99ce95cb 9adc0f47
Pipeline #322606 passed with stages
in 10 minutes and 8 seconds
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.4 ARG BASE_TAG=8.4
FROM goharbor/notary-signer-photon:v2.2.1 as base FROM goharbor/notary-signer-photon:v2.2.2 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -8,7 +8,7 @@ name: "opensource/goharbor/notary-signer" ...@@ -8,7 +8,7 @@ name: "opensource/goharbor/notary-signer"
# 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:
- "v2.2.1" - "v2.2.2"
- "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://github.com/theupdateframework/notary" org.opencontainers.image.url: "https://github.com/theupdateframework/notary"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "goharbor" org.opencontainers.image.vendor: "goharbor"
org.opencontainers.image.version: "v2.2.1" org.opencontainers.image.version: "v2.2.2"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "container,registry,signing" mil.dso.ironbank.image.keywords: "container,registry,signing"
## 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: goharbor/notary-signer-photon:v2.2.1 - tag: goharbor/notary-signer-photon:v2.2.2
url: docker://docker.io/goharbor/notary-signer-photon@sha256:42cd8a38577be972ccb33150d815b5dc1b2abf0d3e164a2cfb60b1aef72907e1 url: docker://docker.io/goharbor/notary-signer-photon@sha256:e963210826b2d0a31071de6d47cf470f58505c47a0c01f722fd90f3b4c88f273
# 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