From 4e8995b63122f1751ec4b573d6d0eaccec26dabd Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 09:50:23 -0600 Subject: [PATCH 1/7] meh --- Dockerfile | 2 +- hardening_manifest.yaml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb418d7..d2b027c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} WORKDIR /opt -ENV IMG_TAR_VERSION=0.174.6 +ENV IMG_TAR_VERSION=0.174.13-1 ENV LANG="C.UTF-8" USER root diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index cd04b45..da1c30a 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,8 @@ name: "confluentinc/confluent-operator" # The most specific version should be the first tag and will be shown # on ironbank.dso.mil tags: -- "0.174.6" +- "0.174.13-1" +- "0.174.13" - "0.174" # Build args passed to Dockerfile ARGs @@ -23,17 +24,17 @@ labels: 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.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.type: "commercial" mil.dso.ironbank.product.name: "Confluent Platform" resources: -- filename: confluent-operator-0.174.6_opt.tar.gz - url: https://ironbank-files.s3.amazonaws.com/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.13-1_opt.tar.gz validation: type: sha256 - value: 57b4aae0f4963fa897dec63e6412433dfd4c6ab1f50a5fc8300bbf6a887d8e2b + value: # List of project maintainers maintainers: -- GitLab From dbcf9d1d8179f8b433a7b3a0e472d57b77480602 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 11:38:25 -0600 Subject: [PATCH 2/7] meh --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index da1c30a..b3e9cb3 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -34,7 +34,7 @@ resources: url: https://ironbank-files.s3.amazonaws.com/confluent-operator-0.174.13-1_opt.tar.gz validation: type: sha256 - value: + value: 80cf9a0d790def699d1cbb3b98709da5dfdc388c3ad3ca4ea9c3c320654c5f87 # List of project maintainers maintainers: -- GitLab From fe2b85be2939619a213ba980eac7bc92871f5481 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 12:12:48 -0600 Subject: [PATCH 3/7] meh --- Dockerfile | 4 ++-- hardening_manifest.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2b027c..6a3f1e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,14 +13,14 @@ USER root 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 ## For auditing & debugging COPY Dockerfile /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 && \ chown -R root:root /opt/manager && chmod -R ag+rw /opt /opt/manager diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b3e9cb3..dc91bfb 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -30,8 +30,8 @@ labels: mil.dso.ironbank.product.name: "Confluent Platform" resources: -- filename: confluent-operator-0.174.13-1_opt.tar.gz - url: https://ironbank-files.s3.amazonaws.com/confluent-operator-0.174.13-1_opt.tar.gz +- filename: confluent-operator_0.174.13-1_Opt.tar.gz + url: https://ironbank-files.s3.amazonaws.com/confluent-operator_0.174.13-1_Opt.tar.gz validation: type: sha256 value: 80cf9a0d790def699d1cbb3b98709da5dfdc388c3ad3ca4ea9c3c320654c5f87 -- GitLab From 922818cbe6a0751b7ce716b925ab7a2ab69db8b1 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 12:48:05 -0600 Subject: [PATCH 4/7] meh --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a3f1e5..03d23d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ ENV LANG="C.UTF-8" USER root RUN mkdir -p /tmp/untar /licenses /etc/confluent/ironbank - COPY confluent-operator_${IMG_TAR_VERSION}_Opt.tar.gz /tmp/untar COPY LICENSE /licenses @@ -20,7 +19,7 @@ COPY LICENSE /licenses COPY Dockerfile /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 && \ chown -R root:root /opt/manager && chmod -R ag+rw /opt /opt/manager -- GitLab From fcb84e295adabf86fd1dd9c549f58ee635fa5686 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 13:51:56 -0600 Subject: [PATCH 5/7] meh --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index dc91bfb..9617878 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -34,7 +34,7 @@ resources: url: https://ironbank-files.s3.amazonaws.com/confluent-operator_0.174.13-1_Opt.tar.gz validation: type: sha256 - value: 80cf9a0d790def699d1cbb3b98709da5dfdc388c3ad3ca4ea9c3c320654c5f87 + value: a8296d9f33527b7ca36ef8058210de590a23c511b44ee60f782f66dc3a3bf7dc # List of project maintainers maintainers: -- GitLab From b9bb02242a03f73d2cbb7b83581578388b9ee3e7 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 14:01:04 -0600 Subject: [PATCH 6/7] meh --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9617878..dc91bfb 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -34,7 +34,7 @@ resources: url: https://ironbank-files.s3.amazonaws.com/confluent-operator_0.174.13-1_Opt.tar.gz validation: type: sha256 - value: a8296d9f33527b7ca36ef8058210de590a23c511b44ee60f782f66dc3a3bf7dc + value: 80cf9a0d790def699d1cbb3b98709da5dfdc388c3ad3ca4ea9c3c320654c5f87 # List of project maintainers maintainers: -- GitLab From b252b343c5526841c48a62f03dd9a97ce52c3f95 Mon Sep 17 00:00:00 2001 From: Scott Stroud Date: Thu, 29 Jul 2021 14:01:40 -0600 Subject: [PATCH 7/7] asdf --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index dc91bfb..9617878 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -34,7 +34,7 @@ resources: url: https://ironbank-files.s3.amazonaws.com/confluent-operator_0.174.13-1_Opt.tar.gz validation: type: sha256 - value: 80cf9a0d790def699d1cbb3b98709da5dfdc388c3ad3ca4ea9c3c320654c5f87 + value: a8296d9f33527b7ca36ef8058210de590a23c511b44ee60f782f66dc3a3bf7dc # List of project maintainers maintainers: -- GitLab