From 984c231e5d8e4e8727ae5bf6b945da3ccd25c5a7 Mon Sep 17 00:00:00 2001
From: Jakub Cechacek <jcechace@gmail.com>
Date: Wed, 15 Nov 2023 15:08:23 +0100
Subject: [PATCH] DBZ-6551 Adapting to modularisation of operator project

---
 operator/2.5/Dockerfile      | 2 +-
 operator/snapshot/.gitignore | 1 +
 operator/snapshot/Dockerfile | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 operator/snapshot/.gitignore

diff --git a/operator/2.5/Dockerfile b/operator/2.5/Dockerfile
index 0afb944a..74a2994e 100644
--- a/operator/2.5/Dockerfile
+++ b/operator/2.5/Dockerfile
@@ -87,7 +87,7 @@ ENV LANGUAGE='en_US:en'
 ENV DEBEZIUM_VERSION=2.5.0.Alpha2 \
     OPERATOR_HOME=/operator \
     MAVEN_REPO_CENTRAL="https://repo1.maven.org/maven2"
-ENV OPERATOR_URL_PATH=io/debezium/debezium-operator/$DEBEZIUM_VERSION/debezium-operator-$DEBEZIUM_VERSION.tar.gz \
+ENV OPERATOR_URL_PATH=io/debezium/debezium-operator-dist/$DEBEZIUM_VERSION/debezium-operator-dist-$DEBEZIUM_VERSION.tar.gz \
     OPERATOR_MD5=89215c080b01361f6df0d1fa7e90ee0c
 
 USER root
diff --git a/operator/snapshot/.gitignore b/operator/snapshot/.gitignore
new file mode 100644
index 00000000..cbf4320f
--- /dev/null
+++ b/operator/snapshot/.gitignore
@@ -0,0 +1 @@
+debezium-operator-dist*.tar.gz
\ No newline at end of file
diff --git a/operator/snapshot/Dockerfile b/operator/snapshot/Dockerfile
index 3c169546..21713438 100644
--- a/operator/snapshot/Dockerfile
+++ b/operator/snapshot/Dockerfile
@@ -101,10 +101,10 @@ RUN mkdir $OPERATOR_HOME;
 #
 # Download the snapshot version of debezium-operator and then install it to the `$OPERATOR_HOME` directory...
 #
-RUN SNAPSHOT_VERSION=$(curl --silent -fSL $MAVEN_OSS_SNAPSHOT/io/debezium/debezium-operator/$DEBEZIUM_VERSION/maven-metadata.xml | awk -F'<[^>]+>' '/<extension>tar.gz<\/extension>/ {getline; print $2; exit}'); \
-    echo "Downloading and installing debezium-operator-$SNAPSHOT_VERSION.tar.gz ..." ; \
+RUN SNAPSHOT_VERSION=$(curl --silent -fSL $MAVEN_OSS_SNAPSHOT/io/debezium/debezium-operator-dist/$DEBEZIUM_VERSION/maven-metadata.xml | awk -F'<[^>]+>' '/<extension>tar.gz<\/extension>/ {getline; print $2; exit}'); \
+    echo "Downloading and installing debezium-operator-dist-$SNAPSHOT_VERSION.tar.gz ..." ; \
     curl --silent -fSL -o /tmp/operator.tar.gz  $MAVEN_OSS_SNAPSHOT/io/debezium/debezium-operator/$DEBEZIUM_VERSION/debezium-operator-$SNAPSHOT_VERSION.tar.gz && \
-    echo "Extracting debezium-operator-$SNAPSHOT_VERSION.tar.gz ..." && \
+    echo "Extracting debezium-operator-dist-$SNAPSHOT_VERSION.tar.gz ..." && \
     tar xzf /tmp/operator.tar.gz -C $OPERATOR_HOME --strip-components 1 && \
     echo "Successfully installed debezium-operator-$SNAPSHOT_VERSION.tar.gz !" && \
     rm -f /tmp/operator.tar.gz;