UNCLASSIFIED

Skip to content

GitLab

Commit fef0ec10 authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch '0.174.13-1' into 'development' 

Version Update

See merge request !19
parents 664a6f13 b252b343
Pipeline #396125 passed with stages
in 16 minutes and 5 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
Dockerfile
View file @ fef0ec10
...@@ -6,21 +6,20 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ...@@ -6,21 +6,20 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
WORKDIR /opt WORKDIR /opt
ENV IMG_TAR_VERSION=0.174.6 ENV IMG_TAR_VERSION=0.174.13-1
ENV LANG="C.UTF-8" ENV LANG="C.UTF-8"
USER root USER root
RUN mkdir -p /tmp/untar /licenses /etc/confluent/ironbank RUN mkdir -p /tmp/untar /licenses /etc/confluent/ironbank
COPY confluent-operator_${IMG_TAR_VERSION}_Opt.tar.gz /tmp/untar
COPY confluent-operator-${IMG_TAR_VERSION}_opt.tar.gz /tmp/untar
COPY LICENSE /licenses COPY LICENSE /licenses
## For auditing & debugging ## For auditing & debugging
COPY Dockerfile /etc/confluent/ironbank/ COPY Dockerfile /etc/confluent/ironbank/
COPY hardening_manifest.yaml /etc/confluent/ironbank/ COPY hardening_manifest.yaml /etc/confluent/ironbank/
RUN cd /tmp/untar && tar -xvf confluent-operator-*_opt.tar.gz && rm confluent-operator-*_opt.tar.gz && \ RUN cd /tmp/untar && tar -xvf confluent-operator*_Opt.tar.gz && rm confluent-operator*_Opt.tar.gz && \
mv * /opt/ && cd /opt && rm -Rf /tmp/untar && \ mv * /opt/ && cd /opt && rm -Rf /tmp/untar && \
chown -R root:root /opt/manager && chmod -R ag+rw /opt /opt/manager chown -R root:root /opt/manager && chmod -R ag+rw /opt /opt/manager
......
hardening_manifest.yaml
View file @ fef0ec10
...@@ -8,7 +8,8 @@ name: "confluentinc/confluent-operator" ...@@ -8,7 +8,8 @@ name: "confluentinc/confluent-operator"
# 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:
- "0.174.6" - "0.174.13-1"
- "0.174.13"
- "0.174" - "0.174"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -23,17 +24,17 @@ labels: ...@@ -23,17 +24,17 @@ labels:
org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE" org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
org.opencontainers.image.url: "https://docs.confluent.io/6.1.1/installation/operator/index.html" org.opencontainers.image.url: "https://docs.confluent.io/6.1.1/installation/operator/index.html"
org.opencontainers.image.vendor: "Confluent" org.opencontainers.image.vendor: "Confluent"
org.opencontainers.image.version: "0.174.6" org.opencontainers.image.version: "0.174.13-1"
mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator" mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
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"
resources: resources:
- filename: confluent-operator-0.174.6_opt.tar.gz - filename: confluent-operator_0.174.13-1_Opt.tar.gz
url: https://ironbank-files.s3.amazonaws.com/confluent-operator-0.174.6_opt.tar.gz url: https://ironbank-files.s3.amazonaws.com/confluent-operator_0.174.13-1_Opt.tar.gz
validation: validation:
type: sha256 type: sha256
value: 57b4aae0f4963fa897dec63e6412433dfd4c6ab1f50a5fc8300bbf6a887d8e2b value: a8296d9f33527b7ca36ef8058210de590a23c511b44ee60f782f66dc3a3bf7dc
# 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