UNCLASSIFIED - NO CUI

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

Merge branch 'development' into 'master'

Development

See merge request !34
parents 76bac15d 08bead4f
No related branches found
No related tags found
1 merge request!34Development
Pipeline #3776468 passed with warnings
ARG CONFLUENT_OPERATOR_BASE_IMAGE=confluentinc/confluent-operator
ARG CONFLUENT_OPERATOR_BASE_TAG=0.1033.22
ARG CONFLUENT_OPERATOR_BASE_TAG=0.1033.33
ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=redhat/ubi/ubi8
......
......@@ -8,15 +8,15 @@ name: "confluentinc/confluent-operator"
# The most specific version should be the first tag and will be shown
# on ironbank.dso.mil
tags:
- "2.9.2"
- "2.9.3"
- "2.9"
- "0.1033.22"
- "0.1033.33"
- "0.1033"
# Build args passed to Dockerfile ARGs
args:
CONFLUENT_OPERATOR_BASE_IMAGE: "confluentinc/confluent-operator"
CONFLUENT_OPERATOR_BASE_TAG: "0.1033.22"
CONFLUENT_OPERATOR_BASE_TAG: "0.1033.33"
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.9"
......@@ -27,14 +27,14 @@ labels:
org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
org.opencontainers.image.url: "https://docs.confluent.io/current/installation/operator/index.html"
org.opencontainers.image.vendor: "Confluent"
org.opencontainers.image.version: "0.1033.22"
org.opencontainers.image.version: "0.1033.33"
mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
mil.dso.ironbank.image.type: "commercial"
mil.dso.ironbank.product.name: "Confluent Platform"
resources:
- tag: "confluentinc/confluent-operator:0.1033.22"
url: "docker://docker.io/confluentinc/confluent-operator@sha256:2c18f36254baa793bea43c2fd5de51026a4bcd0c6fee0baee80ffdb50d77b1d0"
- tag: "confluentinc/confluent-operator:0.1033.33"
url: "docker://docker.io/confluentinc/confluent-operator@sha256:d0c5cce43a3030cd2f6f9d1585b6c74eedf27d1c820c2b13277a00cb5678dd3a"
# List of project maintainers
maintainers:
......
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