UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit ef7a422a authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !39
parents 8c9660e9 ae66fe2e
No related branches found
No related tags found
1 merge request!39Development
Pipeline #4047593 passed with warnings
......@@ -3,7 +3,7 @@ ARG BASE_IMAGE=ironbank/google/distroless/base
ARG BASE_TAG=nonroot
ARG REGISTRY=fips-containers.istio.tetratelabs.com
ARG IMAGE=pilot
ARG TAG=1.23.4-tetratefips-v0-distroless
ARG TAG=1.23.5-tetratefips-v0-distroless
FROM ${REGISTRY}/${IMAGE}:${TAG} AS base
......
......@@ -3,7 +3,7 @@ ARG BASE_IMAGE=ironbank/google/distroless/base
ARG BASE_TAG=nonroot
ARG REGISTRY=fips-containers.istio.tetratelabs.com
ARG IMAGE=pilot
ARG TAG=1.23.4-tetratefips-v0-distroless.arm64
ARG TAG=1.23.5-tetratefips-v0-distroless.arm64
FROM ${REGISTRY}/${IMAGE}:${TAG} AS base
......
......@@ -8,8 +8,8 @@ name: "tetrate/istio/pilot"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "1.23.4-tetratefips-v0"
- "1.23.4"
- "1.23.5-tetratefips-v0"
- "1.23.5"
- "1.23"
# Build args passed to Dockerfile ARGs
......@@ -28,7 +28,7 @@ labels:
org.opencontainers.image.url: "https://cloudsmith.io/~tetrate/repos/getistio-containers/packages/detail/docker/pilot"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "tetrate"
org.opencontainers.image.version: "1.23.4"
org.opencontainers.image.version: "1.23.5"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "container, proxy, routing"
## This value can be "opensource" or "commercial"
......@@ -38,13 +38,13 @@ labels:
# List of resources to make available to the offline build context
resources:
- tag: fips-containers.istio.tetratelabs.com/pilot:1.23.4-tetratefips-v0-distroless
url: docker://fips-containers.istio.tetratelabs.com/pilot@sha256:68ac4eeed3672599b1692521916367c1e88cfd7450e84f4d69a5ce7fdfaad579
- tag: fips-containers.istio.tetratelabs.com/pilot:1.23.5-tetratefips-v0-distroless
url: docker://fips-containers.istio.tetratelabs.com/pilot@sha256:117432a0ddb1d5168e3dcdc6d65f512d28a23e08f14507aa003a67942d9d02eb
auth:
type: basic
id: tetrate_repo
- tag: fips-containers.istio.tetratelabs.com/pilot:1.23.4-tetratefips-v0-distroless.arm64
url: docker://fips-containers.istio.tetratelabs.com/pilot@sha256:6e0bffd3e78e300e5e4c764d2972b13e2524af55d0e377f17c990ce440bcf9b1
- tag: fips-containers.istio.tetratelabs.com/pilot:1.23.5-tetratefips-v0-distroless.arm64
url: docker://fips-containers.istio.tetratelabs.com/pilot@sha256:f3bb9de7f4d0edcb6b2420bf4a13d372ea7ca68c30a9cb0dad57e378f7de908f
auth:
type: basic
id: tetrate_repo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment