UNCLASSIFIED

Skip to content

GitLab

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

Merge branch 'development' into 'master' 

Merge Development into Master

See merge request !35
parents dec55686 2913008f
Pipeline #317886 passed with stages
in 8 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ e5607e16
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/google/distroless/static ARG BASE_IMAGE=ironbank/google/distroless/static
ARG BASE_TAG=latest ARG BASE_TAG=latest
FROM gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.24.2 as build FROM gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.24.3 as build
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ e5607e16
...@@ -8,7 +8,7 @@ name: "opensource/tektoncd/webhook" ...@@ -8,7 +8,7 @@ name: "opensource/tektoncd/webhook"
# 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:
- "v0.24.2" - "v0.24.3"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -23,13 +23,13 @@ labels: ...@@ -23,13 +23,13 @@ labels:
org.opencontainers.image.licenses: "Apache v2" org.opencontainers.image.licenses: "Apache v2"
org.opencontainers.image.url: "https://github.com/tektoncd/pipeline/tree/master/cmd/webhook" org.opencontainers.image.url: "https://github.com/tektoncd/pipeline/tree/master/cmd/webhook"
org.opencontainers.image.vendor: "Vendor" org.opencontainers.image.vendor: "Vendor"
org.opencontainers.image.version: "v0.24.2" org.opencontainers.image.version: "v0.24.3"
mil.dso.ironbank.image.type: "opensource" mil.dso.ironbank.image.type: "opensource"
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- url: "docker://gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook@sha256:394fe28f330d44ccf6d56c12b06607d14802ed2a14ee5ad91028759cafedf0fe" - url: "docker://gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook@sha256:957c8869b3ff8860ee83ad469160d9a72037fe5a483271b631ea393343d4e065"
tag: "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.24.2" tag: "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.24.3"
# 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

UNCLASSIFIED