From 631d99546b2166236bebe99429bc1fae30cab18d Mon Sep 17 00:00:00 2001
From: Philipp Tolstych <ptolstych@thinkport.digital>
Date: Mon, 11 Jul 2022 14:15:37 +0200
Subject: [PATCH 01/28] update versions for docker build

---
 pom.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2dfa4f3203..b8d51894d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,19 +32,21 @@
         <docker.tag>${io.confluent.common-docker.version}-${docker.os_type}</docker.tag>
         <io.confluent.common-docker.version>7.0.1</io.confluent.common-docker.version>
         <!-- Versions-->
-        <ubi.image.version>8.5-204</ubi.image.version>
+        <ubi.image.version>8.6-854</ubi.image.version>
         <!-- Redhat Package Versions -->
-        <ubi.openssl.version>1.1.1k-4.el8</ubi.openssl.version>
+        <ubi.openssl.version>1.1.1k-6.el8_5</ubi.openssl.version>
         <ubi.wget.version>1.19.5-10.el8</ubi.wget.version>
         <ubi.netcat.version>7.70-6.el8</ubi.netcat.version>
         <ubi.python36.version>3.6.8-38.module+el8.5.0+12207+5c5719bc</ubi.python36.version>
         <ubi.tar.version>1.30-5.el8</ubi.tar.version>
         <ubi.procps.version>3.3.15-6.el8</ubi.procps.version>
         <ubi.krb5.workstation.version>1.18.2-14.el8</ubi.krb5.workstation.version>
-        <ubi.iputils.version>20180629-7.el8</ubi.iputils.version>
+        <ubi.iputils.version>20180629-9.el8</ubi.iputils.version>
         <ubi.hostname.version>3.20-6.el8</ubi.hostname.version>
+        <ubi.xzlibs.version>5.2.4-4.el8_6</ubi.xzlibs.version>
+        <ubi.glibc.version>2.28-189.5.el8_6</ubi.glibc.version>
         <!-- ZULU OpenJDK Package Version -->
-        <ubi.zulu.openjdk.version>11.0.13</ubi.zulu.openjdk.version>
+        <ubi.zulu.openjdk.version>11.0.15-1</ubi.zulu.openjdk.version>
         <!-- Python Module Versions -->
         <ubi.python.pip.version>21.*</ubi.python.pip.version>
         <ubi.python.setuptools.version>54.*</ubi.python.setuptools.version>
@@ -56,4 +58,10 @@
         `-Ddocker.skip-security-update-check=true` -->
         <docker.skip-security-update-check>false</docker.skip-security-update-check>
     </properties>
+    <repositories>
+        <repository>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
 </project>

From 73f6da07e2a8629c25f9b6313826b20802e9b490 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 15:51:11 +0200
Subject: [PATCH 02/28] Add build docker action

---
 .github/workflow/buildDocker.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflow/buildDocker.yml

diff --git a/.github/workflow/buildDocker.yml b/.github/workflow/buildDocker.yml
new file mode 100644
index 0000000000..692eb2069b
--- /dev/null
+++ b/.github/workflow/buildDocker.yml
@@ -0,0 +1,20 @@
+name: Build Docker Images
+on:
+  push:
+    branches: feature/arm64-Build-v7.0.1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+
+      - name: Build project
+        run: mvn clean install
+
+      - name: Build Docker image
+        run: docker build -f base/Dockerfile.ubi8 --build-arg ARTIFACT_ID=cp-base-new --build-arg PROJECT_VERSION=7.0.1 base/
\ No newline at end of file

From 0e603e05024a1337ae57368ac9ba61da8fc1f0e3 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 15:51:59 +0200
Subject: [PATCH 03/28] Add build docker action

---
 .github/workflow/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflow/buildDocker.yml b/.github/workflow/buildDocker.yml
index 692eb2069b..2ac976dafd 100644
--- a/.github/workflow/buildDocker.yml
+++ b/.github/workflow/buildDocker.yml
@@ -1,7 +1,7 @@
 name: Build Docker Images
 on:
   push:
-    branches: feature/arm64-Build-v7.0.1
+
 
 jobs:
   build:

From 1036ac453eadf0c0ac29cea78de45e93d7c66ba5 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 15:52:48 +0200
Subject: [PATCH 04/28] Add build docker action

---
 .github/{workflow => workflows}/buildDocker.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{workflow => workflows}/buildDocker.yml (100%)

diff --git a/.github/workflow/buildDocker.yml b/.github/workflows/buildDocker.yml
similarity index 100%
rename from .github/workflow/buildDocker.yml
rename to .github/workflows/buildDocker.yml

From 7b47c9e822b5bdb84b98f3cfdccd95b535ccc7b8 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 15:53:56 +0200
Subject: [PATCH 05/28] Add build docker action

---
 .github/workflows/buildDocker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 2ac976dafd..d11666b7ca 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -12,6 +12,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
+          distribution: 'zulu'
 
       - name: Build project
         run: mvn clean install

From 2ce4f2f654d4ee031d3d2e0bf1676a653d7e13f3 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 15:58:58 +0200
Subject: [PATCH 06/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index d11666b7ca..18bdd86507 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -18,4 +18,4 @@ jobs:
         run: mvn clean install
 
       - name: Build Docker image
-        run: docker build -f base/Dockerfile.ubi8 --build-arg ARTIFACT_ID=cp-base-new --build-arg PROJECT_VERSION=7.0.1 base/
\ No newline at end of file
+        run: docker buildx build --platform linux/aarch64,linux/amd64 -f base/Dockerfile.ubi8 --build-arg ARTIFACT_ID=cp-base-new --build-arg PROJECT_VERSION=7.0.1 base/
\ No newline at end of file

From f66d441e58e105e0c27731734671edc6e0595951 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:04:36 +0200
Subject: [PATCH 07/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 18bdd86507..f13017febf 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -13,9 +13,24 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
+          cache: 'maven'
 
       - name: Build project
         run: mvn clean install
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build Docker image
-        run: docker buildx build --platform linux/aarch64,linux/amd64 -f base/Dockerfile.ubi8 --build-arg ARTIFACT_ID=cp-base-new --build-arg PROJECT_VERSION=7.0.1 base/
\ No newline at end of file
+        uses: docker/build-push-action@v3
+        with:
+          context: base
+          file: base/Dockerfile.ubi8
+          platforms: linux/amd64,linux/arm64
+          push: false
+          build-args: |
+            ARTIFACT_ID=cp-base-new
+            PROJECT_VERSION=7.0.1
\ No newline at end of file

From fd5958ce4608d56fa94716c373550ccbd68ee2bf Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:17:01 +0200
Subject: [PATCH 08/28] Add build docker action - multi arch

---
 base/Dockerfile.ubi8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index 0827c9a091..e8bf1811d6 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -109,8 +109,8 @@ RUN microdnf --nodocs install yum \
 ARG SKIP_SECURITY_UPDATE_CHECK="false"
 RUN yum check-update || "${SKIP_SECURITY_UPDATE_CHECK}"
 
-ADD --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
-ADD --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/java/${ARTIFACT_ID}/* /usr/share/java/${ARTIFACT_ID}/
+ADD --chown=appuser:appuser base/target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
+ADD --chown=appuser:appuser base/target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/java/${ARTIFACT_ID}/* /usr/share/java/${ARTIFACT_ID}/
 
 COPY --chown=appuser:appuser include/etc/confluent/docker /etc/confluent/docker
 

From 6b9162a89a795eb9ca51af549445e81250ac1c92 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:19:18 +0200
Subject: [PATCH 09/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index f13017febf..814b1525a4 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -18,19 +18,3 @@ jobs:
       - name: Build project
         run: mvn clean install
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: base
-          file: base/Dockerfile.ubi8
-          platforms: linux/amd64,linux/arm64
-          push: false
-          build-args: |
-            ARTIFACT_ID=cp-base-new
-            PROJECT_VERSION=7.0.1
\ No newline at end of file

From 0aae95d18bd8bc2435ff69b306b99b6668044dae Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:23:46 +0200
Subject: [PATCH 10/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 814b1525a4..c47751a13e 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -18,3 +18,7 @@ jobs:
       - name: Build project
         run: mvn clean install
 
+      - uses: actions/upload-artifact@v3
+          with:
+            name: cp-base-new
+            path: target/cp-base-new-7.0.1-package
\ No newline at end of file

From 54baed2322c6d40906779d87d19d66905a3799ca Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:24:17 +0200
Subject: [PATCH 11/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index c47751a13e..e5b82420b2 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -19,6 +19,6 @@ jobs:
         run: mvn clean install
 
       - uses: actions/upload-artifact@v3
-          with:
-            name: cp-base-new
-            path: target/cp-base-new-7.0.1-package
\ No newline at end of file
+        with:
+          name: cp-base-new
+          path: target/cp-base-new-7.0.1-package
\ No newline at end of file

From 8141da2d878882937a2b005be88086ddde251291 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:26:15 +0200
Subject: [PATCH 12/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index e5b82420b2..434fe4fe0a 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -21,4 +21,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: cp-base-new
-          path: target/cp-base-new-7.0.1-package
\ No newline at end of file
+          path: base/target/cp-base-new-7.0.1-package

From 706cba9ab8a64ff1474f59d4589a7e8dfa36d507 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:27:47 +0200
Subject: [PATCH 13/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 434fe4fe0a..c5ccdf24e3 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -21,4 +21,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: cp-base-new
-          path: base/target/cp-base-new-7.0.1-package
+          path: base/target/cp-base-new-7.0.1-package/

From 7682d63ed36377e120d51dc1b52d46bc49a9a3d5 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:28:04 +0200
Subject: [PATCH 14/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index c5ccdf24e3..087bbaeac9 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -18,6 +18,8 @@ jobs:
       - name: Build project
         run: mvn clean install
 
+      - run: ls base/target/
+
       - uses: actions/upload-artifact@v3
         with:
           name: cp-base-new

From dbf765705ca36091f53b060926d81f98e49c454a Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:32:10 +0200
Subject: [PATCH 15/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 087bbaeac9..da09aaf8a9 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -16,7 +16,7 @@ jobs:
           cache: 'maven'
 
       - name: Build project
-        run: mvn clean install
+        run: mvn clean install package -Ddocker.skip-build=true
 
       - run: ls base/target/
 

From e2276da00a05d7799f21915571a0555910613128 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:35:40 +0200
Subject: [PATCH 16/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 base/pom.xml                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index da09aaf8a9..4652b0dc5d 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -16,7 +16,7 @@ jobs:
           cache: 'maven'
 
       - name: Build project
-        run: mvn clean install package -Ddocker.skip-build=true
+        run: mvn clean install package
 
       - run: ls base/target/
 
diff --git a/base/pom.xml b/base/pom.xml
index f49eb290af..efc540f4d5 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -112,6 +112,7 @@
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <configuration>
+                    <skip>true</skip>
                     <buildArgs>
                         <UBI_MINIMAL_VERSION>${ubi.image.version}</UBI_MINIMAL_VERSION>
                         <OPENSSL_VERSION>-${ubi.openssl.version}</OPENSSL_VERSION>

From 46bbb24e045dddfce429f477cf8d59303b2284c6 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:51:10 +0200
Subject: [PATCH 17/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml |  2 +-
 base/pom.xml                      | 35 ++++++++++++-------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 4652b0dc5d..4943ec86e9 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -16,7 +16,7 @@ jobs:
           cache: 'maven'
 
       - name: Build project
-        run: mvn clean install package
+        run: mvn clean install -Ddocker.skip-test=true -pl -jmxterm
 
       - run: ls base/target/
 
diff --git a/base/pom.xml b/base/pom.xml
index efc540f4d5..8a11c3e765 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -80,8 +80,8 @@
         </dependency>
     </dependencies>
 
-      <!-- This jar is only used by the deb8 base image and does not get added to the other images. -->
-      <build>
+    <!-- This jar is only used by the deb8 base image and does not get added to the other images. -->
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -111,26 +111,17 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <buildArgs>
-                        <UBI_MINIMAL_VERSION>${ubi.image.version}</UBI_MINIMAL_VERSION>
-                        <OPENSSL_VERSION>-${ubi.openssl.version}</OPENSSL_VERSION>
-                        <WGET_VERSION>-${ubi.wget.version}</WGET_VERSION>
-                        <NETCAT_VERSION>-${ubi.netcat.version}</NETCAT_VERSION>
-                        <PYTHON36_VERSION>-${ubi.python36.version}</PYTHON36_VERSION>
-                        <TAR_VERSION>-${ubi.tar.version}</TAR_VERSION>
-                        <PROCPS_VERSION>-${ubi.procps.version}</PROCPS_VERSION>
-                        <KRB5_WORKSTATION_VERSION>-${ubi.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
-                        <IPUTILS_VERSION>-${ubi.iputils.version}</IPUTILS_VERSION>
-                        <HOSTNAME_VERSION>-${ubi.hostname.version}</HOSTNAME_VERSION>
-                        <ZULU_OPENJDK_VERSION>-${ubi.zulu.openjdk.version}</ZULU_OPENJDK_VERSION>
-                        <PYTHON_PIP_VERSION>==${ubi.python.pip.version}</PYTHON_PIP_VERSION>
-                        <PYTHON_SETUPTOOLS_VERSION>==${ubi.python.setuptools.version}</PYTHON_SETUPTOOLS_VERSION>
-                        <PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>${ubi.python.confluent.docker.utils.version}</PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>
-                        <SKIP_SECURITY_UPDATE_CHECK>${docker.skip-security-update-check}</SKIP_SECURITY_UPDATE_CHECK>
-                    </buildArgs>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

From b19a6904bf38624e6426f4aea4c5bac315fd9305 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:54:11 +0200
Subject: [PATCH 18/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 4943ec86e9..87cffe3238 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -16,7 +16,7 @@ jobs:
           cache: 'maven'
 
       - name: Build project
-        run: mvn clean install -Ddocker.skip-test=true -pl -jmxterm
+        run: mvn clean install -Pdocker -Ddocker.skip-test=true -pl -jmxterm
 
       - run: ls base/target/
 

From 29f58698c89ffee8818d5e8512f633e837f36112 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:56:16 +0200
Subject: [PATCH 19/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 87cffe3238..eb592d23e3 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -18,9 +18,19 @@ jobs:
       - name: Build project
         run: mvn clean install -Pdocker -Ddocker.skip-test=true -pl -jmxterm
 
-      - run: ls base/target/
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-      - uses: actions/upload-artifact@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v3
         with:
-          name: cp-base-new
-          path: base/target/cp-base-new-7.0.1-package/
+          context: base
+          file: base/Dockerfile.ubi8
+          platforms: linux/amd64,linux/arm64
+          push: false
+          build-args: |
+            ARTIFACT_ID=cp-base-new
+            PROJECT_VERSION=7.0.1

From 7f9b747d7c8ddbb33e49fa1080ed047579bf7b8f Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 16:59:06 +0200
Subject: [PATCH 20/28] Add build docker action - multi arch

---
 base/Dockerfile.ubi8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8
index e8bf1811d6..0827c9a091 100644
--- a/base/Dockerfile.ubi8
+++ b/base/Dockerfile.ubi8
@@ -109,8 +109,8 @@ RUN microdnf --nodocs install yum \
 ARG SKIP_SECURITY_UPDATE_CHECK="false"
 RUN yum check-update || "${SKIP_SECURITY_UPDATE_CHECK}"
 
-ADD --chown=appuser:appuser base/target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
-ADD --chown=appuser:appuser base/target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/java/${ARTIFACT_ID}/* /usr/share/java/${ARTIFACT_ID}/
+ADD --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
+ADD --chown=appuser:appuser target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/java/${ARTIFACT_ID}/* /usr/share/java/${ARTIFACT_ID}/
 
 COPY --chown=appuser:appuser include/etc/confluent/docker /etc/confluent/docker
 

From 47b9e449f81392b48c6166106810a01ea48fa005 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Mon, 11 Jul 2022 17:13:22 +0200
Subject: [PATCH 21/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index eb592d23e3..6cfd0e94ab 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -34,3 +34,5 @@ jobs:
           build-args: |
             ARTIFACT_ID=cp-base-new
             PROJECT_VERSION=7.0.1
+
+      - run: docker images
\ No newline at end of file

From 0097c14d2ee7a9d036c5a82863dbe4e4c017191a Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 16:46:35 +0200
Subject: [PATCH 22/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 6cfd0e94ab..d902d7f1ad 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -2,7 +2,6 @@ name: Build Docker Images
 on:
   push:
 
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,6 +14,12 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_KEY }}
+
       - name: Build project
         run: mvn clean install -Pdocker -Ddocker.skip-test=true -pl -jmxterm
 
@@ -31,8 +36,8 @@ jobs:
           file: base/Dockerfile.ubi8
           platforms: linux/amd64,linux/arm64
           push: false
+          tags: ubi8-latest
           build-args: |
             ARTIFACT_ID=cp-base-new
             PROJECT_VERSION=7.0.1
 
-      - run: docker images
\ No newline at end of file

From 7b57daa0dbf02353881f26514ff62db19277a4f3 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 16:47:47 +0200
Subject: [PATCH 23/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index d902d7f1ad..199b77d766 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -14,12 +14,6 @@ jobs:
           distribution: 'zulu'
           cache: 'maven'
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_KEY }}
-
       - name: Build project
         run: mvn clean install -Pdocker -Ddocker.skip-test=true -pl -jmxterm
 
@@ -29,13 +23,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_KEY }}
+
       - name: Build Docker image
         uses: docker/build-push-action@v3
         with:
           context: base
           file: base/Dockerfile.ubi8
           platforms: linux/amd64,linux/arm64
-          push: false
+          push: true
           tags: ubi8-latest
           build-args: |
             ARTIFACT_ID=cp-base-new

From 9dc2306967b1384ce9fd3c196da19020b0a25475 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 16:59:28 +0200
Subject: [PATCH 24/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 199b77d766..2c4ade872c 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -36,7 +36,7 @@ jobs:
           file: base/Dockerfile.ubi8
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ubi8-latest
+          tags: thinkportgmbh/confluentinc/cp-base-new:ubi8-latest
           build-args: |
             ARTIFACT_ID=cp-base-new
             PROJECT_VERSION=7.0.1

From 7b94ec2f70fe78b747cc27fd4eb8b35c5ff9a373 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 16:59:38 +0200
Subject: [PATCH 25/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 2c4ade872c..3a80d778ff 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           context: base
           file: base/Dockerfile.ubi8
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           tags: thinkportgmbh/confluentinc/cp-base-new:ubi8-latest
           build-args: |

From 7ae3038ef62b1713d49d6cebb1fa84d988d41481 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 17:16:36 +0200
Subject: [PATCH 26/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 3a80d778ff..d8e01ee501 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -36,7 +36,7 @@ jobs:
           file: base/Dockerfile.ubi8
           platforms: linux/amd64
           push: true
-          tags: thinkportgmbh/confluentinc/cp-base-new:ubi8-latest
+          tags: thinkportgmbh/cp-base-new:ubi8-latest
           build-args: |
             ARTIFACT_ID=cp-base-new
             PROJECT_VERSION=7.0.1

From e37d5528fae8562615a4174d3b484a8a31154be9 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 17:31:32 +0200
Subject: [PATCH 27/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index d8e01ee501..82076d0f09 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           context: base
           file: base/Dockerfile.ubi8
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: thinkportgmbh/cp-base-new:ubi8-latest
           build-args: |

From adef1f9a356d3455cbfff3b23ba02c44b6541f09 Mon Sep 17 00:00:00 2001
From: Alexander Muthmann <amuthmann@thinkport.digital>
Date: Tue, 12 Jul 2022 18:41:38 +0200
Subject: [PATCH 28/28] Add build docker action - multi arch

---
 .github/workflows/buildDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
index 82076d0f09..cf8774df05 100644
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -36,7 +36,7 @@ jobs:
           file: base/Dockerfile.ubi8
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: thinkportgmbh/cp-base-new:ubi8-latest
+          tags: thinkportgmbh/cp-base-new:7.0.1
           build-args: |
             ARTIFACT_ID=cp-base-new
             PROJECT_VERSION=7.0.1