This is an automated email from the ASF dual-hosted git repository. chibenwa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bbf264dbb76b8b597f150516ce3c3692c319f412 Author: Rene Cordier <[email protected]> AuthorDate: Tue Jul 29 09:11:21 2025 +0700 JAMES-4142 Upgrade Docker cassandra image to 5.0.9 --- .../java/org/apache/james/backends/cassandra/DockerCassandra.java | 4 ++-- docs/antora.yml | 2 +- .../pages/distributed/operate/logging/docker-compose-block.adoc | 2 +- docs/modules/servers/pages/distributed/run/run-java.adoc | 2 +- server/apps/distributed-app/README.adoc | 4 ++-- server/apps/distributed-app/docker-compose-with-pulsar.yml | 4 ++-- server/apps/distributed-app/docker-compose.yml | 4 ++-- server/apps/distributed-pop3-app/README.adoc | 4 ++-- server/apps/distributed-pop3-app/docker-compose.yml | 4 ++-- src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md | 4 ++-- src/site/markdown/server/install/guice-cassandra.md | 6 +++--- src/site/xdoc/server/quick-start-cassandra.xml | 2 +- third-party/clamav/docker-compose.yml | 4 ++-- third-party/rspamd/docker-compose-distributed.yml | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java index 18d05fc09e..e55581c43a 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java @@ -137,7 +137,7 @@ public class DockerCassandra { @SuppressWarnings("resource") public DockerCassandra() { - this("cassandra_4_1_5-" + buildSpecificImageDiscriminator(), + this("cassandra_5_0_4-" + buildSpecificImageDiscriminator(), getFixedBuildId().isEmpty(), AdditionalDockerFileStep.IDENTITY); } @@ -181,7 +181,7 @@ public class DockerCassandra { new ImageFromDockerfile(imageName,deleteImageAfterUsage) .withDockerfileFromBuilder(builder -> additionalSteps.applyStep(builder - .from("cassandra:4.1.9") + .from("cassandra:5.0.9") .env("CASSANDRA_CONFIG", "/etc/cassandra") .run(memorySettingCommand + "&& echo \"-Dcassandra.skip_wait_for_gossip_to_settle=0\" >> " + JVM_OPTIONS diff --git a/docs/antora.yml b/docs/antora.yml index 930183a544..0435405711 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -9,7 +9,7 @@ asciidoc: # Third party versions James is built, shipped and tested against. # Bump them together with the docker-compose files of server/apps/*. java-version: '21@' - cassandra-version: '4.1.9@' + cassandra-version: '5.0.9@' opensearch-version: '2.19.2@' rabbitmq-version: '4.1.1@' postgresql-version: '16.9@' diff --git a/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc b/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc index 2fe47fb0e2..f77f469142 100644 --- a/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc +++ b/docs/modules/servers/pages/distributed/operate/logging/docker-compose-block.adoc @@ -75,4 +75,4 @@ services: - "5601:5601" depends_on: - opensearch ----- \ No newline at end of file +---- diff --git a/docs/modules/servers/pages/distributed/run/run-java.adoc b/docs/modules/servers/pages/distributed/run/run-java.adoc index 3b5d25145d..aca225aa27 100644 --- a/docs/modules/servers/pages/distributed/run/run-java.adoc +++ b/docs/modules/servers/pages/distributed/run/run-java.adoc @@ -83,4 +83,4 @@ objectstorage.s3.endPoint=http://s3.docker.test:8000/ objectstorage.s3.region=eu-west-1 objectstorage.s3.accessKeyId=accessKey1 objectstorage.s3.secretKey=secretKey1 ----- \ No newline at end of file +---- diff --git a/server/apps/distributed-app/README.adoc b/server/apps/distributed-app/README.adoc index 403238de3f..1afb77855a 100644 --- a/server/apps/distributed-app/README.adoc +++ b/server/apps/distributed-app/README.adoc @@ -10,14 +10,14 @@ Firstly, create your own user network on Docker for the James environment: Third party compulsory dependencies: - * Cassandra 4.0 + * Cassandra 5.0.9 * OpenSearch 2.1.0 * RabbitMQ-Management 3.8.18 * Zenko Cloudserver or AWS S3 [source] ---- -$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.9 +$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:5.0.9 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' --env 'DISABLE_SECURITY_PLUGIN=true' --env 'DISABLE_INSTALL_DEMO_CONFIG=true' opensearchproject/opensearch:2.19.2 $ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:4.1.1-management $ docker run -d --network james -p 8000:8000 --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745 diff --git a/server/apps/distributed-app/docker-compose-with-pulsar.yml b/server/apps/distributed-app/docker-compose-with-pulsar.yml index 17719dee37..6b6e1a8351 100644 --- a/server/apps/distributed-app/docker-compose-with-pulsar.yml +++ b/server/apps/distributed-app/docker-compose-with-pulsar.yml @@ -48,7 +48,7 @@ services: cassandra: container_name: cassandra - image: cassandra:4.1.9 + image: cassandra:5.0.9 ports: - "9042:9042" healthcheck: @@ -93,4 +93,4 @@ services: networks: - james networks: - james: \ No newline at end of file + james: diff --git a/server/apps/distributed-app/docker-compose.yml b/server/apps/distributed-app/docker-compose.yml index 4ce3e06343..525b53d619 100644 --- a/server/apps/distributed-app/docker-compose.yml +++ b/server/apps/distributed-app/docker-compose.yml @@ -43,7 +43,7 @@ services: - elasticsearch cassandra: - image: cassandra:4.1.9 + image: cassandra:5.0.9 ports: - "9042:9042" healthcheck: @@ -82,4 +82,4 @@ services: - james networks: - james: \ No newline at end of file + james: diff --git a/server/apps/distributed-pop3-app/README.adoc b/server/apps/distributed-pop3-app/README.adoc index a680c908ca..72039068d1 100644 --- a/server/apps/distributed-pop3-app/README.adoc +++ b/server/apps/distributed-pop3-app/README.adoc @@ -13,13 +13,13 @@ Firstly, create your own user network on Docker for the James environment: Third party compulsory dependencies: - * Cassandra 4.0 + * Cassandra 5.0.9 * RabbitMQ-Management 3.8.18 * Zenko Cloudserver or AWS S3 [source] ---- -$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.9 +$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:5.0.9 $ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:4.1.1-management $ docker run -d --network james --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745 ---- diff --git a/server/apps/distributed-pop3-app/docker-compose.yml b/server/apps/distributed-pop3-app/docker-compose.yml index 1e53cab4e8..84098ce0e9 100644 --- a/server/apps/distributed-pop3-app/docker-compose.yml +++ b/server/apps/distributed-pop3-app/docker-compose.yml @@ -43,7 +43,7 @@ services: - elasticsearch cassandra: - image: cassandra:4.1.9 + image: cassandra:5.0.9 ports: - "9042:9042" healthcheck: @@ -82,4 +82,4 @@ services: - james networks: - james: \ No newline at end of file + james: diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md index 98d1880399..945e3ff3ec 100644 --- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md +++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md @@ -5,7 +5,7 @@ ### Requirements - Java 11 SDK - - Docker ∕ OpenSearch 2.1.0, RabbitMQ Management 3.8.18, compatible S3 ObjectStorage and Cassandra 4.0 + - Docker ∕ OpenSearch 2.1.0, RabbitMQ Management 3.8.18, compatible S3 ObjectStorage and Cassandra 5.0.9 - Maven 3 ### Building the artifacts @@ -47,7 +47,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore You need to have a Cassandra, OpenSearch, S3 and RabbitMQ instance running. You can either install the servers or launch them via docker: ```bash -$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.9 +$ docker run -d -p 9042:9042 --name=cassandra cassandra:5.0.9 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2 $ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.13.3-management $ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 ghcr.io/scality/cloudserver:c1ba296859690c1cbbec609aaae430f6b04b4745 diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md index 96b110407c..d225ade41a 100644 --- a/src/site/markdown/server/install/guice-cassandra.md +++ b/src/site/markdown/server/install/guice-cassandra.md @@ -5,7 +5,7 @@ ### Requirements - Java 11 SDK - - Docker ∕ OpenSearch 2.1.0 and Cassandra 4.0 + - Docker ∕ OpenSearch 2.1.0 and Cassandra 5.0.9 - Maven 3 *WARNING*: JAMES-3591 Cassandra is not made to store large binary content, its use will be suboptimal compared to @@ -28,7 +28,7 @@ mvn clean install ### Requirements - * Cassandra 4.0 + * Cassandra 5.0.9 * OpenSearch 2.1.0 ### James Launch @@ -48,7 +48,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore You need to have a Cassandra and an OpenSearch instance running. You can either install the servers or launch them via docker: ```bash -$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.9 +$ docker run -d -p 9042:9042 --name=cassandra cassandra:5.0.9 $ docker run -d --network james -p 9200:9200 --name=opensearch --env 'discovery.type=single-node' opensearchproject/opensearch:2.19.2 ``` diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml index 2e2b724b8d..0fa7a6e6cd 100644 --- a/src/site/xdoc/server/quick-start-cassandra.xml +++ b/src/site/xdoc/server/quick-start-cassandra.xml @@ -64,7 +64,7 @@ Step 3: Deploy 3.1. Deploy Cassandra (optional) You may skip this part if you already have a running Cassandra on your network. -<i>$ docker run --detach=true --name=cassandra cassandra:4.1.9</i> +<i>$ docker run --detach=true --name=cassandra cassandra:5.0.9</i> 3.2. Deploy OpenSearch (optional) You may skip this part if you already have a running OpenSearch on your network. diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml index 60ddcdfdac..365dee165d 100644 --- a/third-party/clamav/docker-compose.yml +++ b/third-party/clamav/docker-compose.yml @@ -48,7 +48,7 @@ services: - elasticsearch cassandra: - image: cassandra:4.1.9 + image: cassandra:5.0.9 ports: - "9042:9042" healthcheck: @@ -92,4 +92,4 @@ services: - james networks: - james: \ No newline at end of file + james: diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml index 9692eeefd0..b69e36ee3f 100644 --- a/third-party/rspamd/docker-compose-distributed.yml +++ b/third-party/rspamd/docker-compose-distributed.yml @@ -53,7 +53,7 @@ services: - elasticsearch cassandra: - image: cassandra:4.1.9 + image: cassandra:5.0.9 ports: - "9042:9042" healthcheck: @@ -122,4 +122,4 @@ services: - james networks: - james: \ No newline at end of file + james: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
