From 32c052f2164af2ca54767d67c79d93de4554a86e Mon Sep 17 00:00:00 2001
From: Michael Burman <yak@iki.fi>
Date: Fri, 20 Dec 2024 15:50:36 +0200
Subject: [PATCH] Add $DSE_HOME//resources/cassandra/tools/bin to the default
 path

---
 CHANGELOG.md                | 1 +
 dse/Dockerfile-dse6.8.jdk11 | 2 +-
 dse/Dockerfile-dse6.8.jdk8  | 2 +-
 dse/Dockerfile-dse6.8.ubi8  | 2 +-
 dse/Dockerfile-dse6.9.jdk11 | 2 +-
 dse/Dockerfile-dse6.9.ubi8  | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b00248ec..255fe020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
 
 ## unreleased
 
+* [ENHANCEMENT] [#579](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/579) Add /opt/dse/resources/cassandra/tools/bin to the default PATH for sstable tools
 * [ENHANCEMENT] [#574](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/574) Support consistency parameter in the /start when replacing a DSE node. 
 
 ## v0.1.90 (2024-11-22)
diff --git a/dse/Dockerfile-dse6.8.jdk11 b/dse/Dockerfile-dse6.8.jdk11
index 436ac26f..2c6b9f6c 100644
--- a/dse/Dockerfile-dse6.8.jdk11
+++ b/dse/Dockerfile-dse6.8.jdk11
@@ -192,7 +192,7 @@ RUN if ! grep -qxf "JVM_OPTS=\"\$JVM_OPTS -Dinsights.default_mode=disabled\"" <
 # Fix COPY directory modes
 RUN chmod g+w ${MAAC_PATH} ${DSE_HOME} ${DSE_AGENT_HOME} ${CDC_AGENT_PATH}
 
-ENV PATH=$DSE_HOME/bin:$PATH
+ENV PATH=$DSE_HOME/bin:$DSE_HOME/resources/cassandra/tools/bin:$PATH
 ENV HOME=$DSE_HOME
 WORKDIR $HOME
 
diff --git a/dse/Dockerfile-dse6.8.jdk8 b/dse/Dockerfile-dse6.8.jdk8
index 17e4e8b3..7b8c2287 100644
--- a/dse/Dockerfile-dse6.8.jdk8
+++ b/dse/Dockerfile-dse6.8.jdk8
@@ -202,7 +202,7 @@ RUN if ! grep -qxf "JVM_OPTS=\"\$JVM_OPTS -Dinsights.default_mode=disabled\"" <
 # Fix COPY directory modes
 RUN chmod g+w ${MAAC_PATH} ${DSE_HOME} ${DSE_AGENT_HOME} ${CDC_AGENT_PATH}
 
-ENV PATH=$DSE_HOME/bin:$PATH
+ENV PATH=$DSE_HOME/bin:$DSE_HOME/resources/cassandra/tools/bin:$PATH
 ENV HOME=$DSE_HOME
 WORKDIR $HOME
 
diff --git a/dse/Dockerfile-dse6.8.ubi8 b/dse/Dockerfile-dse6.8.ubi8
index d93121cf..f5edc3f6 100644
--- a/dse/Dockerfile-dse6.8.ubi8
+++ b/dse/Dockerfile-dse6.8.ubi8
@@ -67,7 +67,7 @@ LABEL summary="The best distribution of Apache Cassandra™ with integrated Sear
 LABEL description="Built on the best distribution of Apache Cassandra™, DataStax Enterprise is the always-on database designed to allow you to effortlessly build and scale your apps, integrating graph, search, analytics, administration, developer tooling, and monitoring into a single unified platform. We power your apps' real-time moments so you can create instant insights and powerful customer experiences."
 
 ENV DSE_HOME=/opt/dse
-ENV PATH=$DSE_HOME/bin:$PATH
+ENV PATH=$DSE_HOME/bin:$DSE_HOME/resources/cassandra/tools/bin:$PATH
 ENV HOME=$DSE_HOME
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
diff --git a/dse/Dockerfile-dse6.9.jdk11 b/dse/Dockerfile-dse6.9.jdk11
index 643d3617..3de1b3cb 100644
--- a/dse/Dockerfile-dse6.9.jdk11
+++ b/dse/Dockerfile-dse6.9.jdk11
@@ -192,7 +192,7 @@ RUN if ! grep -qxf "JVM_OPTS=\"\$JVM_OPTS -Dinsights.default_mode=disabled\"" <
 # Fix COPY directory modes
 RUN chmod g+w ${MAAC_PATH} ${DSE_HOME} ${DSE_AGENT_HOME} ${CDC_AGENT_PATH}
 
-ENV PATH=$DSE_HOME/bin:$PATH
+ENV PATH=$DSE_HOME/bin:$DSE_HOME/resources/cassandra/tools/bin:$PATH
 ENV HOME=$DSE_HOME
 WORKDIR $HOME
 
diff --git a/dse/Dockerfile-dse6.9.ubi8 b/dse/Dockerfile-dse6.9.ubi8
index a99795c2..213e67e6 100644
--- a/dse/Dockerfile-dse6.9.ubi8
+++ b/dse/Dockerfile-dse6.9.ubi8
@@ -66,7 +66,7 @@ LABEL summary="The best distribution of Apache Cassandra™ with integrated Sear
 LABEL description="Built on the best distribution of Apache Cassandra™, DataStax Enterprise is the always-on database designed to allow you to effortlessly build and scale your apps, integrating graph, search, analytics, administration, developer tooling, and monitoring into a single unified platform. We power your apps' real-time moments so you can create instant insights and powerful customer experiences."
 
 ENV DSE_HOME=/opt/dse
-ENV PATH=$DSE_HOME/bin:$PATH
+ENV PATH=$DSE_HOME/bin:$DSE_HOME/resources/cassandra/tools/bin:$PATH
 ENV HOME=$DSE_HOME
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'