From 471d250569e9c153e0e871a678b71b355d5b6fa7 Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Mon, 7 Jun 2021 12:38:40 -0600
Subject: [PATCH 1/4] feedback

---
 .gitignore                     |   3 +
 LICENSE                        | 203 +--------------------------------
 build-image.sh                 |  64 +++++++++++
 scripts/build-image.sh         |  64 +++++++++++
 scripts/genManifestTemplate.sh |  80 +++++++++++++
 scripts/importArtifacts.sh     |  70 ++++++++++++
 6 files changed, 282 insertions(+), 202 deletions(-)
 create mode 100644 .gitignore
 create mode 100755 build-image.sh
 create mode 100755 scripts/build-image.sh
 create mode 100755 scripts/genManifestTemplate.sh
 create mode 100755 scripts/importArtifacts.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12fed4b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.whl
+*.tar.gz
+*.rpm
diff --git a/LICENSE b/LICENSE
index e06d208..44cfd8b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,202 +1 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+Copyright 2020 Confluent, Inc.
\ No newline at end of file
diff --git a/build-image.sh b/build-image.sh
new file mode 100755
index 0000000..4826cb6
--- /dev/null
+++ b/build-image.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+start=`date +%s`
+
+##
+# Docker Dependencies: 
+#   https://docs.confluent.io/current/installation/docker/image-reference.html#image-reference
+
+##
+# Settings for the build process
+
+if [[ -f .env ]]; then
+    echo "Loading in '.env' for values ..."
+    export $(grep -v '^#' .env | xargs)
+    echo " "
+elif [[ -f ../.env ]]; then
+    echo "Loading in PARENT '.env' for values ..."
+    export $(grep -v '^#' ../.env | xargs)
+    echo " "
+fi
+
+# The BASE_ is used by PlatformOne to change the base image, we will make use of RedHat
+BASE_REGISTRY=${BASE_REGISTRY:-'registry1.dso.mil'}
+MANI='hardening_manifest.yaml'
+
+cd ../
+
+## parse manifest with yq (https://github.com/mikefarah/yq)
+name=$(yq e '.name' $MANI)
+tags=( $(yq e '.tags.[]' $MANI) )
+baseImage=$(yq e '.args.BASE_IMAGE' $MANI)
+baseTag=$(yq e '.args.BASE_TAG' $MANI)
+
+echo "Starting $name build ..."
+
+echo "$name docker build ..."
+
+if [[ "$1" == "--squash" ]]; then
+  echo "Squashing like a cockroach ..."
+  DOCKER_BUILDKIT=1 docker build \
+    --squash \
+    --tag $BASE_REGISTRY/$name:latest \
+    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
+    --build-arg BASE_IMAGE=$baseImage \
+    --build-arg BASE_TAG=$baseTag \
+    . 
+else
+  DOCKER_BUILDKIT=1 docker build \
+    --tag $BASE_REGISTRY/$name:latest \
+    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
+    --build-arg BASE_IMAGE=$baseImage \
+    --build-arg BASE_TAG=$baseTag \
+    .  
+fi
+
+for tag in "${tags[@]}";do
+  docker tag $BASE_REGISTRY/$name:latest $BASE_REGISTRY/$name:$tag
+  echo "🏷 Tagged build with $BASE_REGISTRY/$name:$tag" 
+done
+
+cd scripts
+
+end=`date +%s`
+duration=$((end-start))
+echo "🏁 Finished $CONTAINER build (${duration} seconds)"
\ No newline at end of file
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
new file mode 100755
index 0000000..4826cb6
--- /dev/null
+++ b/scripts/build-image.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+start=`date +%s`
+
+##
+# Docker Dependencies: 
+#   https://docs.confluent.io/current/installation/docker/image-reference.html#image-reference
+
+##
+# Settings for the build process
+
+if [[ -f .env ]]; then
+    echo "Loading in '.env' for values ..."
+    export $(grep -v '^#' .env | xargs)
+    echo " "
+elif [[ -f ../.env ]]; then
+    echo "Loading in PARENT '.env' for values ..."
+    export $(grep -v '^#' ../.env | xargs)
+    echo " "
+fi
+
+# The BASE_ is used by PlatformOne to change the base image, we will make use of RedHat
+BASE_REGISTRY=${BASE_REGISTRY:-'registry1.dso.mil'}
+MANI='hardening_manifest.yaml'
+
+cd ../
+
+## parse manifest with yq (https://github.com/mikefarah/yq)
+name=$(yq e '.name' $MANI)
+tags=( $(yq e '.tags.[]' $MANI) )
+baseImage=$(yq e '.args.BASE_IMAGE' $MANI)
+baseTag=$(yq e '.args.BASE_TAG' $MANI)
+
+echo "Starting $name build ..."
+
+echo "$name docker build ..."
+
+if [[ "$1" == "--squash" ]]; then
+  echo "Squashing like a cockroach ..."
+  DOCKER_BUILDKIT=1 docker build \
+    --squash \
+    --tag $BASE_REGISTRY/$name:latest \
+    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
+    --build-arg BASE_IMAGE=$baseImage \
+    --build-arg BASE_TAG=$baseTag \
+    . 
+else
+  DOCKER_BUILDKIT=1 docker build \
+    --tag $BASE_REGISTRY/$name:latest \
+    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
+    --build-arg BASE_IMAGE=$baseImage \
+    --build-arg BASE_TAG=$baseTag \
+    .  
+fi
+
+for tag in "${tags[@]}";do
+  docker tag $BASE_REGISTRY/$name:latest $BASE_REGISTRY/$name:$tag
+  echo "🏷 Tagged build with $BASE_REGISTRY/$name:$tag" 
+done
+
+cd scripts
+
+end=`date +%s`
+duration=$((end-start))
+echo "🏁 Finished $CONTAINER build (${duration} seconds)"
\ No newline at end of file
diff --git a/scripts/genManifestTemplate.sh b/scripts/genManifestTemplate.sh
new file mode 100755
index 0000000..943df45
--- /dev/null
+++ b/scripts/genManifestTemplate.sh
@@ -0,0 +1,80 @@
+if [[ -f .env ]]; then
+    echo "Loading in '.env' for values ..."
+    export $(grep -v '^#' .env | xargs)
+    echo " "
+fi
+
+VERSION=${VERSION:-'6.1.1.0'}
+
+SCRIPTS_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+PROJECT_HOME=${PROJECT_HOME:-'../'}
+PROJECT_HOME=$(realpath $PROJECT_HOME)
+
+myShaRona () {  
+    myfile=$(basename $1)
+    mydir=$(dirname $1)
+
+    mkdir -p $mydir
+    if [ ! -e "$mydir/filelist.txt" ] ; then
+        touch "$mydir/filelist.txt"
+    fi
+
+    if [[ "$OSTYPE" == "darwin"* ]] ; then
+        mySha=$(shasum -a 256 $1 | cut -d " " -f 1)
+    else
+        mySha=$(sha256sum $1 | cut -d " " -f 1)
+    fi
+
+    echo -e "$myfile | $mySha" >> $mydir/filelist.txt
+}
+
+filelist () {
+    rm -f $1/filelist.txt
+
+    for filename in $1/*; do
+        myShaRona $filename
+    done
+}
+
+if [ $# -eq 0 ]; then
+    echo "filelist.txt or dir path argument required "
+    exit 1
+fi
+
+# if there is not a filelist.txt, generate one
+if [ -f "$1" ]; then
+    filefile=$(realpath $1)
+elif [ -f "$1/filelist.txt" ]; then
+    filefile=$(realpath $1)/filelist.txt
+elif [ -d "$1" ]; then
+    filefile=$(realpath $1)/filelist.txt
+fi
+
+filelist $1
+
+basedir=$(dirname $filefile)
+cd $basedir
+
+if [[ $filefile == *"ironbank-files"* ]]; then
+    urlPrefix="https://ironbank-files.s3.amazonaws.com"
+elif [[ $filefile == *"confluent"* ]]; then
+    urlPrefix="https://packages.confluent.io/rpm/${VERSION:0:3}"
+elif [[ $filefile == *"pythonhosted"* ]]; then
+    echo "unsupported cause of the weird guid in the path"
+    exit 0
+fi
+
+echo "resources:" > $basedir/hardened_manifest_template.yaml
+
+while IFS= read -r line
+do
+IFS=" | " read -a parts <<< $line
+cat >> $basedir/hardened_manifest_template.yaml << EOL
+- filename: ${parts[0]}
+  url: ${urlPrefix}/${parts[0]}
+  validation:
+    type: sha256
+    value: ${parts[1]}
+EOL
+
+done < "$filefile"
\ No newline at end of file
diff --git a/scripts/importArtifacts.sh b/scripts/importArtifacts.sh
new file mode 100755
index 0000000..3213270
--- /dev/null
+++ b/scripts/importArtifacts.sh
@@ -0,0 +1,70 @@
+
+#!/bin/bash
+
+start=`date +%s`
+
+if [[ -f .env ]]; then
+    echo "Loading in '.env' for values ..."
+    export $(grep -v '^#' .env | xargs)
+    echo " "
+fi
+
+SCRIPTS_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+PROJECT_HOME=${PROJECT_HOME:-'../'}
+PROJECT_HOME=$(realpath $PROJECT_HOME)
+RESOURCE_HOME=${RESOURCE_HOME:-'../../resources'}
+RESOURCE_HOME=$(realpath $RESOURCE_HOME)
+
+importArtifacts() {
+    
+    manifestPath=$1
+    httpdomain=$2
+    resourceDir=$3
+
+    echo -e "\nImporting ${httpdomain} artifacts ..."
+
+    maniDir=$(dirname "$manifestPath")
+    if [[ ! -f "$maniDir/build-image.sh" ]]; then
+        cp build-image.sh $maniDir/
+    fi
+
+    # (re)set the filelist.txt
+    mkdir -p $resourceDir    
+    prefix="url: "
+    pushd $resourceDir
+        grep $httpdomain $manifestPath | while read -r line ; do
+            url=${line##*$prefix}
+            filename=$(basename "$url")
+            
+            if [[ ! -f "$filename" ]]; then
+                echo "downloading ${url} ..."
+                wget $url            
+            else
+                echo "Using existing $filename. Run ./clean.sh if thats not desired."
+            fi
+
+            if [[ ! -f "$maniDir/$filename" ]]; then
+                echo "copying ${filename} into ${maniDir} ..."
+                cp $filename $maniDir/
+            fi
+        done
+    popd
+}
+    
+mani=$(realpath "../hardening_manifest.yaml")
+
+importArtifacts $mani 'ironbank-files.s3.amazonaws.com' "$RESOURCE_HOME/ironbank-files"
+importArtifacts $mani 'packages.confluent.io' "$RESOURCE_HOME/confluent"
+importArtifacts $mani 'files.pythonhosted.org' "$RESOURCE_HOME/pythonhosted"
+
+echo "Generating hardening_manifest_template.yaml ..."
+$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/ironbank-files"
+$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/confluent"
+$SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/pythonhosted"
+
+end=`date +%s`
+duration=$((end-start))
+echo "#########################"
+echo "All done (${duration} seconds)"
+echo "#########################"
+
-- 
GitLab


From b2d04f19355a60142bf11451efd5bc2fbfbc419e Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Mon, 7 Jun 2021 15:43:00 -0600
Subject: [PATCH 2/4] rpm key stuff

---
 .gitignore                 |  1 +
 Dockerfile                 |  4 ++-
 build-image.sh             | 64 --------------------------------------
 hardening_manifest.yaml    |  5 +++
 scripts/importArtifacts.sh |  3 --
 5 files changed, 9 insertions(+), 68 deletions(-)
 delete mode 100755 build-image.sh

diff --git a/.gitignore b/.gitignore
index 12fed4b..a6f066a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.whl
 *.tar.gz
 *.rpm
+archive.key
diff --git a/Dockerfile b/Dockerfile
index 1cac6f4..96e40e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,7 @@ RUN chown appuser:appuser -R /usr/logs
 
 # Copy required RPMs
 COPY *.rpm /tmp/
+COPY archive.key /tmp/
 
 ########################################
 # confluentinc/control-center-images
@@ -61,7 +62,8 @@ EXPOSE 9021
 
 
 RUN echo "===> Installing ${COMPONENT}" \
-    && dnf install --nogpgcheck -y /tmp/confluent-common-${RPM_VERSION}.noarch.rpm \
+    && rpm --import /tmp/archive.key \
+    && dnf install -y /tmp/confluent-common-${RPM_VERSION}.noarch.rpm \
         /tmp/confluent-telemetry-${RPM_VERSION}.noarch.rpm \
         /tmp/confluent-rest-utils-${RPM_VERSION}.noarch.rpm \
         /tmp/confluent-rebalancer-${RPM_VERSION}.noarch.rpm \
diff --git a/build-image.sh b/build-image.sh
deleted file mode 100755
index 4826cb6..0000000
--- a/build-image.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-start=`date +%s`
-
-##
-# Docker Dependencies: 
-#   https://docs.confluent.io/current/installation/docker/image-reference.html#image-reference
-
-##
-# Settings for the build process
-
-if [[ -f .env ]]; then
-    echo "Loading in '.env' for values ..."
-    export $(grep -v '^#' .env | xargs)
-    echo " "
-elif [[ -f ../.env ]]; then
-    echo "Loading in PARENT '.env' for values ..."
-    export $(grep -v '^#' ../.env | xargs)
-    echo " "
-fi
-
-# The BASE_ is used by PlatformOne to change the base image, we will make use of RedHat
-BASE_REGISTRY=${BASE_REGISTRY:-'registry1.dso.mil'}
-MANI='hardening_manifest.yaml'
-
-cd ../
-
-## parse manifest with yq (https://github.com/mikefarah/yq)
-name=$(yq e '.name' $MANI)
-tags=( $(yq e '.tags.[]' $MANI) )
-baseImage=$(yq e '.args.BASE_IMAGE' $MANI)
-baseTag=$(yq e '.args.BASE_TAG' $MANI)
-
-echo "Starting $name build ..."
-
-echo "$name docker build ..."
-
-if [[ "$1" == "--squash" ]]; then
-  echo "Squashing like a cockroach ..."
-  DOCKER_BUILDKIT=1 docker build \
-    --squash \
-    --tag $BASE_REGISTRY/$name:latest \
-    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
-    --build-arg BASE_IMAGE=$baseImage \
-    --build-arg BASE_TAG=$baseTag \
-    . 
-else
-  DOCKER_BUILDKIT=1 docker build \
-    --tag $BASE_REGISTRY/$name:latest \
-    --build-arg BASE_REGISTRY=$BASE_REGISTRY \
-    --build-arg BASE_IMAGE=$baseImage \
-    --build-arg BASE_TAG=$baseTag \
-    .  
-fi
-
-for tag in "${tags[@]}";do
-  docker tag $BASE_REGISTRY/$name:latest $BASE_REGISTRY/$name:$tag
-  echo "🏷 Tagged build with $BASE_REGISTRY/$name:$tag" 
-done
-
-cd scripts
-
-end=`date +%s`
-duration=$((end-start))
-echo "🏁 Finished $CONTAINER build (${duration} seconds)"
\ No newline at end of file
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 9e9a7ff..4790a6c 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -217,6 +217,11 @@ resources:
   validation:
     type: sha256
     value: 7e2622a934f04a2e5b23a355f920473ccf0144e946b433bc619a9802c1e3785c
+- filename: archive.key
+  url: https://packages.confluent.io/rpm/6.1/archive.key
+  validation:
+    type: sha256
+    value: b569e9d80bc08b65d342491f8b94e47eb7032701ce17b091f212e1072672a4d5
 - filename: confluent-common-6.1.1-1.noarch.rpm
   url: https://packages.confluent.io/rpm/6.1/confluent-common-6.1.1-1.noarch.rpm
   validation:
diff --git a/scripts/importArtifacts.sh b/scripts/importArtifacts.sh
index 3213270..43dfcaf 100755
--- a/scripts/importArtifacts.sh
+++ b/scripts/importArtifacts.sh
@@ -24,9 +24,6 @@ importArtifacts() {
     echo -e "\nImporting ${httpdomain} artifacts ..."
 
     maniDir=$(dirname "$manifestPath")
-    if [[ ! -f "$maniDir/build-image.sh" ]]; then
-        cp build-image.sh $maniDir/
-    fi
 
     # (re)set the filelist.txt
     mkdir -p $resourceDir    
-- 
GitLab


From ce22dda4d56c936f6cb7236196bf6c4f6d50a983 Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Tue, 8 Jun 2021 09:54:36 -0600
Subject: [PATCH 3/4] feedback

---
 Dockerfile  | 3 +--
 license.txt | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 license.txt

diff --git a/Dockerfile b/Dockerfile
index 96e40e9..cfce3c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@ RUN pip3 install --no-index --prefix=/usr/local --upgrade --find-links /tmp/pyth
 RUN mkdir -p /usr/logs /licenses \
     && useradd --no-log-init --create-home --shell /bin/bash appuser
 
-COPY license.txt /licenses
+COPY LICENSE /licenses
 
 RUN chown appuser:appuser -R /usr/logs 
 
@@ -60,7 +60,6 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
 # primary
 EXPOSE 9021
 
-
 RUN echo "===> Installing ${COMPONENT}" \
     && rpm --import /tmp/archive.key \
     && dnf install -y /tmp/confluent-common-${RPM_VERSION}.noarch.rpm \
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 44cfd8b..0000000
--- a/license.txt
+++ /dev/null
@@ -1 +0,0 @@
-Copyright 2020 Confluent, Inc.
\ No newline at end of file
-- 
GitLab


From bea81822bc73d5468533a57f01d69675a3036e4b Mon Sep 17 00:00:00 2001
From: Scott Stroud <sstroud@confluent.io>
Date: Thu, 10 Jun 2021 10:32:36 -0600
Subject: [PATCH 4/4] maven update

---
 .gitignore                 | 1 +
 Dockerfile                 | 2 ++
 hardening_manifest.yaml    | 7 ++++++-
 scripts/importArtifacts.sh | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a6f066a..ea9402d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.tar.gz
 *.rpm
 archive.key
+maven-artifact-3.8.1.jar
diff --git a/Dockerfile b/Dockerfile
index cfce3c9..1a07863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -89,11 +89,13 @@ COPY cp-enterprise-control-center-operator-*_EtcConfluent.tar.gz /etc/
 ## For auditing & debugging
 COPY Dockerfile /etc/confluent/ironbank/
 COPY hardening_manifest.yaml /etc/confluent/ironbank/
+COPY maven-artifact-3.8.1.jar /tmp/
 
 RUN echo "===> Installing operator stuff" \
     && cd /usr/share && tar -xvf *_UsrShareJava.tar.gz && rm *_UsrShareJava.tar.gz \
     && cd /opt && tar -xvf *_OptCaas.tar.gz && rm *_OptCaas.tar.gz \
     && cd /etc && tar -xvf *_EtcConfluent.tar.gz && rm *_EtcConfluent.tar.gz \
+    && find /usr/share/java -name "maven-artifact-3.6.3.jar" -execdir cp /tmp/maven-artifact-3.8.1.jar . \; -exec rm {} \; \ 
     && chown -R appuser:appuser /etc/confluent \
     && mkdir -p "${CONTROL_CENTER_DATA_DIR}" "${CONTROL_CENTER_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" \
    	&& chmod -R ag+w "${CONTROL_CENTER_DATA_DIR}" "${CONTROL_CENTER_CONFIG_DIR}" "/opt" \
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 4790a6c..0ca3315 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -271,7 +271,12 @@ resources:
   url: https://ironbank-files.s3.amazonaws.com/cp-enterprise-control-center-operator-6.1.1.0_EtcConfluent.tar.gz
   validation:
     type: sha256
-    value: 065649b8a7e5aa82dd6b2a023d3772ed445c4c8fb00bc126c82bdb279f12fa3c     
+    value: 065649b8a7e5aa82dd6b2a023d3772ed445c4c8fb00bc126c82bdb279f12fa3c 
+- filename: maven-artifact-3.8.1.jar
+  url: https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.1/maven-artifact-3.8.1.jar
+  validation:
+    type: sha256
+    value: 9dbd3db15ac4816471e72981cb06ef90f3ffa8be6628dddf7135f7bd69bee0c0     
   
 
 # List of project maintainers
diff --git a/scripts/importArtifacts.sh b/scripts/importArtifacts.sh
index 43dfcaf..3f2b73d 100755
--- a/scripts/importArtifacts.sh
+++ b/scripts/importArtifacts.sh
@@ -53,6 +53,7 @@ mani=$(realpath "../hardening_manifest.yaml")
 importArtifacts $mani 'ironbank-files.s3.amazonaws.com' "$RESOURCE_HOME/ironbank-files"
 importArtifacts $mani 'packages.confluent.io' "$RESOURCE_HOME/confluent"
 importArtifacts $mani 'files.pythonhosted.org' "$RESOURCE_HOME/pythonhosted"
+importArtifacts $mani 'repo1.maven.org' "$RESOURCE_HOME/maven"
 
 echo "Generating hardening_manifest_template.yaml ..."
 $SCRIPTS_HOME/genManifestTemplate.sh "$RESOURCE_HOME/ironbank-files"
-- 
GitLab