Merge branch 'master' into update_dse_695_6853

k8ssandra · Jan 9, 2025 · e2c79d9 · e2c79d9
2 parents f4a4fa9 + 2d48a92
commit e2c79d9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect
 
 * [FEATURE] [#584](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/584) Add DSE 6.9.5 to build matrix
 * [FEATURE] [#582](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/582) Add DSE 6.8.53 to build matrix
+* [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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'