Update cassandra

[tianon]

Changes:

• docker-library/cassandra@9315e44: Remove errant "-q"
• docker-library/cassandra@5cde9b1: Merge pull request update 4.0 Dockerfile to add -Xss512k to JVM_OPTS for ppc64le cassandra#252 from Mathieu-Ferraton/4.0-ppc64le
• docker-library/cassandra@1a9d5f3: update 4.0 Dockerfile to add -Xss512k to JVM_OPTS for ppc64le
• docker-library/cassandra@dee264d: Remove arch exclusions -- 4.0 is now working on s390x!

[github-actions]

Diff for 2831c1d:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 22fa605..5ee5a23 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,15 +3,15 @@ GitRepo: https://github.com/docker-library/cassandra.git
 
 Tags: 3.0.27, 3.0
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: cdd3cd5b3b9e8863fbcdd5ac1d8646c52bc74f10
+GitCommit: 9315e4444c9f92b19e3e2d4fbe7c77293f2d33d7
 Directory: 3.0
 
 Tags: 3.11.13, 3.11, 3
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: cdd3cd5b3b9e8863fbcdd5ac1d8646c52bc74f10
+GitCommit: 1a9d5f3ac97204f71bba86259aa56815f8a7eee7
 Directory: 3.11
 
 Tags: 4.0.4, 4.0, 4, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: cdd3cd5b3b9e8863fbcdd5ac1d8646c52bc74f10
+GitCommit: 1a9d5f3ac97204f71bba86259aa56815f8a7eee7
 Directory: 4.0
diff --git a/cassandra_3.0/Dockerfile b/cassandra_3.0/Dockerfile
index 3ed8f70..42720c7 100644
--- a/cassandra_3.0/Dockerfile
+++ b/cassandra_3.0/Dockerfile
@@ -144,16 +144,9 @@ RUN set -eux; \
 		ppc64el) \
 # https://issues.apache.org/jira/browse/CASSANDRA-13345
 # "The stack size specified is too small, Specify at least 328k"
-			if grep -q -- '^-Xss' "$CASSANDRA_CONF/jvm.options"; then \
-# 3.11+ (jvm.options)
-				grep -- '^-Xss256k$' "$CASSANDRA_CONF/jvm.options"; \
-				sed -ri 's/^-Xss256k$/-Xss512k/' "$CASSANDRA_CONF/jvm.options"; \
-				grep -- '^-Xss512k$' "$CASSANDRA_CONF/jvm.options"; \
-			elif grep -q -- '-Xss256k' "$CASSANDRA_CONF/cassandra-env.sh"; then \
-# 3.0 (cassandra-env.sh)
+			grep -- '-Xss256k' "$CASSANDRA_CONF/cassandra-env.sh"; \
 			sed -ri 's/-Xss256k/-Xss512k/g' "$CASSANDRA_CONF/cassandra-env.sh"; \
 			grep -- '-Xss512k' "$CASSANDRA_CONF/cassandra-env.sh"; \
-			fi; \
 			;; \
 	esac; \
 	\
diff --git a/cassandra_3/Dockerfile b/cassandra_3/Dockerfile
index 0e74c03..954233b 100644
--- a/cassandra_3/Dockerfile
+++ b/cassandra_3/Dockerfile
@@ -144,16 +144,9 @@ RUN set -eux; \
 		ppc64el) \
 # https://issues.apache.org/jira/browse/CASSANDRA-13345
 # "The stack size specified is too small, Specify at least 328k"
-			if grep -q -- '^-Xss' "$CASSANDRA_CONF/jvm.options"; then \
-# 3.11+ (jvm.options)
 			grep -- '^-Xss256k$' "$CASSANDRA_CONF/jvm.options"; \
 			sed -ri 's/^-Xss256k$/-Xss512k/' "$CASSANDRA_CONF/jvm.options"; \
 			grep -- '^-Xss512k$' "$CASSANDRA_CONF/jvm.options"; \
-			elif grep -q -- '-Xss256k' "$CASSANDRA_CONF/cassandra-env.sh"; then \
-# 3.0 (cassandra-env.sh)
-				sed -ri 's/-Xss256k/-Xss512k/g' "$CASSANDRA_CONF/cassandra-env.sh"; \
-				grep -- '-Xss512k' "$CASSANDRA_CONF/cassandra-env.sh"; \
-			fi; \
 			;; \
 	esac; \
 	\
diff --git a/cassandra_latest/Dockerfile b/cassandra_latest/Dockerfile
index 88d7949..1a5197f 100644
--- a/cassandra_latest/Dockerfile
+++ b/cassandra_latest/Dockerfile
@@ -144,16 +144,9 @@ RUN set -eux; \
 		ppc64el) \
 # https://issues.apache.org/jira/browse/CASSANDRA-13345
 # "The stack size specified is too small, Specify at least 328k"
-			if grep -q -- '^-Xss' "$CASSANDRA_CONF/jvm.options"; then \
-# 3.11+ (jvm.options)
-				grep -- '^-Xss256k$' "$CASSANDRA_CONF/jvm.options"; \
-				sed -ri 's/^-Xss256k$/-Xss512k/' "$CASSANDRA_CONF/jvm.options"; \
-				grep -- '^-Xss512k$' "$CASSANDRA_CONF/jvm.options"; \
-			elif grep -q -- '-Xss256k' "$CASSANDRA_CONF/cassandra-env.sh"; then \
-# 3.0 (cassandra-env.sh)
-				sed -ri 's/-Xss256k/-Xss512k/g' "$CASSANDRA_CONF/cassandra-env.sh"; \
-				grep -- '-Xss512k' "$CASSANDRA_CONF/cassandra-env.sh"; \
-			fi; \
+			grep -- '^-Xss256k$' "$CASSANDRA_CONF/jvm-server.options"; \
+			sed -ri 's/^-Xss256k$/-Xss512k/' "$CASSANDRA_CONF/jvm-server.options"; \
+			grep -- '^-Xss512k$' "$CASSANDRA_CONF/jvm-server.options"; \
 			;; \
 	esac; \
 	\

Relevant Maintainers:

• cassandra: @tianon @yosifkit