Merge pull request jhipster#24359 from mshima/cassandra-4

Update to cassandra 4
qmonmert · Nov 24, 2023 · 85301ec · 85301ec
2 parents a621d4d + 315678c
commit 85301ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap
@@ -364,11 +364,13 @@ jhipster:
     container_name: mscassandra-cassandra
     healthcheck:
       test:
-        - CMD-SHELL
-        - '[ $$(nodetool statusgossip) = running ]'
+        - CMD
+        - cqlsh
+        - '-e'
+        - describe keyspaces
       interval: 5s
       timeout: 25s
-      retries: 10
+      retries: 20
   
   consul:
     image: consul-placeholder

diff --git a/generators/docker/templates/docker/cassandra.yml.ejs b/generators/docker/templates/docker/cassandra.yml.ejs
@@ -33,10 +33,10 @@ services:
       - 127.0.0.1:9042:9042
       - 127.0.0.1:9160:9160
     healthcheck:
-      test: ['CMD-SHELL', '[ $$(nodetool statusgossip) = running ]']
+      test: ['CMD', 'cqlsh', '-e', 'describe keyspaces']
       interval: 5s
       timeout: 25s
-      retries: 10
+      retries: 20
   cassandra-migration:
     environment:
       - CASSANDRA_CONTACT_POINT=<%= baseName.toLowerCase() %>-cassandra

diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile
@@ -26,7 +26,7 @@ LABEL ALIAS=mongodb
 FROM couchbase/server:7.2.3
 LABEL ALIAS=couchbase
 
-FROM cassandra:3.11.14
+FROM cassandra:4.1.3
 
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql