UNCLASSIFIED - NO CUI

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

Merge branch 'development' into 'master'

Development

See merge request !43
parents 4ace97bc b9c21529
No related branches found
No related tags found
1 merge request!43Development
Pipeline #4040499 passed with warnings
ARG CP_BASE_NEW_IMAGE=confluentinc/cp-base-new ARG CP_BASE_NEW_IMAGE=confluentinc/cp-base-new
ARG CP_BASE_NEW_TAG=7.8.1-2-ubi8 ARG CP_BASE_NEW_TAG=7.9.0-1-ubi8
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=redhat/openjdk/openjdk17 ARG BASE_IMAGE=redhat/openjdk/openjdk17
......
...@@ -7,10 +7,10 @@ name: "confluentinc/cp-base-new" ...@@ -7,10 +7,10 @@ name: "confluentinc/cp-base-new"
# 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.dso.mil # on ironbank.dso.mil
tags: tags:
- "Q4_2024_jdk17" - "Q1_2025_jdk17"
- "2025-02-13" - "2025-02-24"
- "7.8.1" - "7.9.0"
- "7.8.1-2-ubi8" - "7.9.0-1-ubi8"
- "latest-ubi8.amd64" - "latest-ubi8.amd64"
- "latest.amd64" - "latest.amd64"
- "latest_jdk17" - "latest_jdk17"
...@@ -19,7 +19,7 @@ tags: ...@@ -19,7 +19,7 @@ tags:
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
CP_BASE_NEW_IMAGE: "confluentinc/cp-base-new" CP_BASE_NEW_IMAGE: "confluentinc/cp-base-new"
CP_BASE_NEW_TAG: "7.8.1-2-ubi8" CP_BASE_NEW_TAG: "7.9.0-1-ubi8"
BASE_IMAGE: "redhat/openjdk/openjdk17" BASE_IMAGE: "redhat/openjdk/openjdk17"
BASE_TAG: "1.17" BASE_TAG: "1.17"
...@@ -30,16 +30,16 @@ labels: ...@@ -30,16 +30,16 @@ labels:
org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE" org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
org.opencontainers.image.url: "https://docs.confluent.io/platform/current/overview.html" org.opencontainers.image.url: "https://docs.confluent.io/platform/current/overview.html"
org.opencontainers.image.vendor: "Confluent" org.opencontainers.image.vendor: "Confluent"
org.opencontainers.image.version: "Q4_2024_jdk17" org.opencontainers.image.version: "Q1_2025_jdk17"
mil.dso.ironbank.image.keywords: "confluent,cflt,kafka,operator,cfk" mil.dso.ironbank.image.keywords: "confluent,cflt,kafka,operator,cfk"
mil.dso.ironbank.image.type: "commercial" mil.dso.ironbank.image.type: "commercial"
mil.dso.ironbank.product.name: "Confluent Platform" mil.dso.ironbank.product.name: "Confluent Platform"
# 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://docker.io/confluentinc/cp-base-new@sha256:7ee5bc2d851f8a5def0465502eb32fe41a9294b77ef78590802634e9fef4e5de" - url: "docker://docker.io/confluentinc/cp-base-new@sha256:bd0ef13663558ea378e12301d9e3ad334684aecc9871754415e155098023ce18"
tag: "confluentinc/cp-base-new:7.8.1-2-ubi8" tag: "confluentinc/cp-base-new:7.9.0-1-ubi8"
- filename: archive.key - filename: archive.key
url: https://packages.confluent.io/rpm/7.8/archive.key url: https://packages.confluent.io/rpm/7.9/archive.key
validation: validation:
type: sha256 type: sha256
value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5 value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5
......
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