JAMES-2531 CASSANDRA_CONFIG is already defined in cassandra Dockerfile and our definition was broken anyway
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/826b00b6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/826b00b6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/826b00b6 Branch: refs/heads/master Commit: 826b00b6f808decc8ba243ad5b3e24533edf7d22 Parents: a0e747f Author: Matthieu Baechler <[email protected]> Authored: Thu Aug 23 16:11:01 2018 +0200 Committer: Benoit Tellier <[email protected]> Committed: Mon Aug 27 02:38:55 2018 +0000 ---------------------------------------------------------------------- .../java/org/apache/james/backends/cassandra/DockerCassandra.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/826b00b6/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java ---------------------------------------------------------------------- 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 66cd13f..b4b0e43 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 @@ -52,7 +52,6 @@ public class DockerCassandra { .withDockerfileFromBuilder(builder -> builder .from("cassandra:3.11.3") - .env("ENV CASSANDRA_CONFIG", "/etc/cassandra") .run("echo \"-Xms" + cassandraMemory + "M\" >> " + JVM_OPTIONS) .run("echo \"-Xmx" + cassandraMemory + "M\" >> " + JVM_OPTIONS) .build())) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
