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
commit 2575ea329c32ec0c1c5496dc0aa2829903940783 Author: Rene Cordier <[email protected]> AuthorDate: Mon Sep 21 09:54:39 2020 +0700 [Fix] The latest stable image of James still uses swift by default with docker-compose For ease of development though, we add a new temp docker-compose file to be able to launch the latest code in dev (branch-master) with S3 API --- ...r-compose.yml => docker-compose-branch-master.yml} | 4 ++-- dockerfiles/run/docker-compose.yml | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose-branch-master.yml similarity index 93% copy from dockerfiles/run/docker-compose.yml copy to dockerfiles/run/docker-compose-branch-master.yml index 3922905..5105e99 100644 --- a/dockerfiles/run/docker-compose.yml +++ b/dockerfiles/run/docker-compose-branch-master.yml @@ -10,7 +10,7 @@ services: - rabbitmq - s3 entrypoint: bash -c "java -Dworking.directory=/root/ -Dlogback.configurationFile=/root/conf/logback.xml -jar james-server.jar" - image: linagora/james-rabbitmq-project:latest + image: linagora/james-rabbitmq-project:branch-master container_name: james hostname: james.local ports: @@ -21,7 +21,7 @@ services: - "465:465" - "587:587" - "993:993" - - "8080:8000" + - "8000:8000" elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml index 3922905..321dca3 100644 --- a/dockerfiles/run/docker-compose.yml +++ b/dockerfiles/run/docker-compose.yml @@ -8,7 +8,7 @@ services: - cassandra - tika - rabbitmq - - s3 + - swift entrypoint: bash -c "java -Dworking.directory=/root/ -Dlogback.configurationFile=/root/conf/logback.xml -jar james-server.jar" image: linagora/james-rabbitmq-project:latest container_name: james @@ -21,7 +21,7 @@ services: - "465:465" - "587:587" - "993:993" - - "8080:8000" + - "8000:8000" elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2 @@ -42,13 +42,10 @@ services: - "5672:5672" - "15672:15672" - s3: - image: zenko/cloudserver:8.2.6 - container_name: s3.docker.test - environment: - - SCALITY_ACCESS_KEY_ID=accessKey1 - - SCALITY_SECRET_ACCESS_KEY=secretKey1 - - S3BACKEND=mem - - LOG_LEVEL=trace - - REMOTE_MANAGEMENT_DISABLE=1 + swift: + image: linagora/openstack-keystone-swift:pike + ports: + - "5000:5000" + - "8080:8080" + - "35357:35357" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
