This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 967a7d93a9 JAMES-4102 Fix build migrating Zenko cloudserv S3 test
image from registry.scality.com to ghcr.io (#2599)
967a7d93a9 is described below
commit 967a7d93a950e8ef0a5f16439866472927b4dd8b
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Wed Jan 15 17:53:23 2025 +0700
JAMES-4102 Fix build migrating Zenko cloudserv S3 test image from
registry.scality.com to ghcr.io (#2599)
Upgrading as well from 8.7.25 to latest 8.80.41
---
.../servers/pages/distributed/operate/logging/docker-compose-block.adoc | 2 +-
docs/modules/servers/pages/distributed/run/run-docker.adoc | 2 +-
docs/modules/servers/pages/distributed/run/run-java.adoc | 2 +-
server/apps/distributed-app/README.adoc | 2 +-
server/apps/distributed-app/docker-compose-with-pulsar.yml | 2 +-
server/apps/distributed-app/docker-compose.yml | 2 +-
server/apps/distributed-pop3-app/README.adoc | 2 +-
server/apps/distributed-pop3-app/docker-compose.yml | 2 +-
.../org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java | 2 +-
src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md | 2 +-
third-party/clamav/docker-compose.yml | 2 +-
third-party/rspamd/docker-compose-distributed.yml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
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 77b46b433f..3e1609d664 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
@@ -46,7 +46,7 @@ services:
- "15672:15672"
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image: ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
diff --git a/docs/modules/servers/pages/distributed/run/run-docker.adoc
b/docs/modules/servers/pages/distributed/run/run-docker.adoc
index c595353737..0df3172f5e 100644
--- a/docs/modules/servers/pages/distributed/run/run-docker.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-docker.adoc
@@ -61,7 +61,7 @@ You need a running *rabbitmq* in docker which connects to
*james* network. To ac
You need a running *Zenko Cloudserver* objectstorage in docker which connects
to *james* network. To achieve this run:
- $ docker run -d --network james --env 'REMOTE_MANAGEMENT_DISABLE=1' --env
'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1'
--name=s3 registry.scality.com/cloudserver/cloudserver:8.7.25
+ $ 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:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
You need a running *OpenSearch* in docker which connects to *james* network.
To achieve this run:
diff --git a/docs/modules/servers/pages/distributed/run/run-java.adoc
b/docs/modules/servers/pages/distributed/run/run-java.adoc
index 3a7df9c30c..333508bf87 100644
--- a/docs/modules/servers/pages/distributed/run/run-java.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-java.adoc
@@ -53,7 +53,7 @@ running. You can either install the servers or launch them
via docker:
$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.5
$ docker run -d --network james -p 9200:9200 --name=opensearch --env
'discovery.type=single-node' opensearchproject/opensearch:2.14.0
$ 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 registry.scality.com/cloudserver/cloudserver:8.7.25
+$ 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:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
----
Once everything is set up, you just have to run the jar with:
diff --git a/server/apps/distributed-app/README.adoc
b/server/apps/distributed-app/README.adoc
index 3fc04f3478..aabd25c12e 100644
--- a/server/apps/distributed-app/README.adoc
+++ b/server/apps/distributed-app/README.adoc
@@ -20,7 +20,7 @@ Third party compulsory dependencies:
$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.5
$ 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.14.0
$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq
rabbitmq:3.13.3-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
registry.scality.com/cloudserver/cloudserver:8.7.25
+$ 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:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
----
== Docker distribution
diff --git a/server/apps/distributed-app/docker-compose-with-pulsar.yml
b/server/apps/distributed-app/docker-compose-with-pulsar.yml
index ab1c6da3a2..5a9a2930cf 100644
--- a/server/apps/distributed-app/docker-compose-with-pulsar.yml
+++ b/server/apps/distributed-app/docker-compose-with-pulsar.yml
@@ -71,7 +71,7 @@ services:
- james
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image:
ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a #v8.80.41
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
diff --git a/server/apps/distributed-app/docker-compose.yml
b/server/apps/distributed-app/docker-compose.yml
index 89f2a921bf..118c9473bf 100644
--- a/server/apps/distributed-app/docker-compose.yml
+++ b/server/apps/distributed-app/docker-compose.yml
@@ -70,7 +70,7 @@ services:
- james
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image:
ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a #v8.80.41
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
diff --git a/server/apps/distributed-pop3-app/README.adoc
b/server/apps/distributed-pop3-app/README.adoc
index 953b8bcfe9..1542ca86a6 100644
--- a/server/apps/distributed-pop3-app/README.adoc
+++ b/server/apps/distributed-pop3-app/README.adoc
@@ -21,7 +21,7 @@ Third party compulsory dependencies:
----
$ docker run -d --network james -p 9042:9042 --name=cassandra cassandra:4.1.5
$ docker run -d --network james -p 5672:5672 -p 15672:15672 --name=rabbitmq
rabbitmq:3.13.3-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 registry.scality.com/cloudserver/cloudserver:8.7.25
+$ 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:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
----
== Docker distribution
diff --git a/server/apps/distributed-pop3-app/docker-compose.yml
b/server/apps/distributed-pop3-app/docker-compose.yml
index ef932201e8..4043a015b7 100644
--- a/server/apps/distributed-pop3-app/docker-compose.yml
+++ b/server/apps/distributed-pop3-app/docker-compose.yml
@@ -70,7 +70,7 @@ services:
- james
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image:
ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a #v8.80.41
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
diff --git
a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
index 2359d6220a..598d14eaaa 100644
---
a/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
+++
b/server/blob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/DockerAwsS3Container.java
@@ -28,7 +28,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
public class DockerAwsS3Container {
- private static final String AWS_S3_DOCKER_IMAGE =
"registry.scality.com/cloudserver/cloudserver:8.7.25";
+ private static final String AWS_S3_DOCKER_IMAGE =
"ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a";
//v8.80.41
private static final int AWS_S3_PORT = 8000;
private static final int ONE_TIME = 1;
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 a96e8202c4..297217aac1 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
@@ -50,7 +50,7 @@ You need to have a Cassandra, OpenSearch, S3 and RabbitMQ
instance running. You
$ docker run -d -p 9042:9042 --name=cassandra cassandra:4.1.5
$ docker run -d --network james -p 9200:9200 --name=opensearch --env
'discovery.type=single-node' opensearchproject/opensearch:2.14.0
$ 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 registry.scality.com/cloudserver/cloudserver:8.7.25
+$ 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:8cbe2c066b3505b26d339dc67315d1041b8c7f3a
```
Once everything is set up, you just have to run the jar with:
diff --git a/third-party/clamav/docker-compose.yml
b/third-party/clamav/docker-compose.yml
index 036b0719f0..c62474a54d 100644
--- a/third-party/clamav/docker-compose.yml
+++ b/third-party/clamav/docker-compose.yml
@@ -75,7 +75,7 @@ services:
- james
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image:
ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a #v8.80.41
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
diff --git a/third-party/rspamd/docker-compose-distributed.yml
b/third-party/rspamd/docker-compose-distributed.yml
index 55908e88c1..421593015e 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -80,7 +80,7 @@ services:
- james
s3:
- image: registry.scality.com/cloudserver/cloudserver:8.7.25
+ image:
ghcr.io/scality/cloudserver:8cbe2c066b3505b26d339dc67315d1041b8c7f3a #v8.80.41
container_name: s3.docker.test
environment:
- SCALITY_ACCESS_KEY_ID=accessKey1
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
