Merge pull request docker-library#17647 from docker-library-bot/cassandra

yosifkit · web-flow · commit 12360c414499 · 2024-10-01T14:54:45.000-07:00
Update cassandra
diff --git a/library/cassandra b/library/cassandra
@@ -1,12 +1,12 @@
-# this file is generated via https://github.com/docker-library/cassandra/blob/41fc6f77fbd75362dfcbeb21a32610c0eec61e28/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/cassandra/blob/75187df9c5b4b5200e1c59fd46163f087d4f798a/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
              Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/cassandra.git
 
-Tags: 5.0.0, 5.0, 5, latest, 5.0.0-jammy, 5.0-jammy, 5-jammy, jammy
+Tags: 5.0.1, 5.0, 5, latest, 5.0.1-jammy, 5.0-jammy, 5-jammy, jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: cb4f6acadef77048615282871fd1480aee75f193
+GitCommit: 9c4cfca225a711f4523ef5134cc54c1a62e69eba
 Directory: 5.0
 
 Tags: 4.1.7, 4.1, 4, 4.1.7-jammy, 4.1-jammy, 4-jammy
diff --git a/test/tests/cassandra-basics/run.sh b/test/tests/cassandra-basics/run.sh
@@ -47,7 +47,8 @@ cqlsh() {
 }
 
 # Make sure our container is listening
-. "$dir/../../retry.sh" 'cqlsh < /dev/null'
+. "$dir/../../retry.sh" --tries 20 'cqlsh < /dev/null'
+# (cassandra takes a long time to start up, especially on GHA)
 
 # https://wiki.apache.org/cassandra/GettingStarted#Step_4:_Using_cqlsh
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ cqlsh() {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`# Make sure our container is listening`
`50`		`-. "$dir/../../retry.sh" 'cqlsh < /dev/null'`
	`50`	`+. "$dir/../../retry.sh" --tries 20 'cqlsh < /dev/null'`
	`51`	`+# (cassandra takes a long time to start up, especially on GHA)`
`51`	`52`
`52`	`53`	`# https://wiki.apache.org/cassandra/GettingStarted#Step_4:_Using_cqlsh`
`53`	`54`