JAMES-2531 Try running raw Cassandra image
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/70f53180 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/70f53180 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/70f53180 Branch: refs/heads/master Commit: 70f53180e7e335405318f3d75707d11634bc4664 Parents: 0fead0d Author: Benoit Tellier <btell...@linagora.com> Authored: Mon Aug 27 10:17:31 2018 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Mon Aug 27 14:16:05 2018 +0200 ---------------------------------------------------------------------- .../james/backends/cassandra/DockerCassandra.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/70f53180/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 b4b0e43..3a26572 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 @@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory; import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.OutputFrame; -import org.testcontainers.images.builder.ImageFromDockerfile; import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import com.github.dockerjava.api.DockerClient; @@ -35,8 +34,6 @@ public class DockerCassandra { private static final Logger logger = LoggerFactory.getLogger(DockerCassandra.class); private static final int CASSANDRA_PORT = 9042; - private static final String CASSANDRA_CONFIG_DIR = "$CASSANDRA_CONFIG"; - private static final String JVM_OPTIONS = CASSANDRA_CONFIG_DIR + "/jvm.options"; private final GenericContainer<?> cassandraContainer; private final DockerClient client; @@ -44,19 +41,8 @@ public class DockerCassandra { @SuppressWarnings("resource") public DockerCassandra() { client = DockerClientFactory.instance().client(); - boolean deleteOnExit = false; - int cassandraMemory = 1200; - long cassandraContainerMemory = Float.valueOf(cassandraMemory * 1.5f * 1024 * 1024L).longValue(); - cassandraContainer = new GenericContainer<>( - new ImageFromDockerfile("cassandra_3_11_3", deleteOnExit) - .withDockerfileFromBuilder(builder -> - builder - .from("cassandra:3.11.3") - .run("echo \"-Xms" + cassandraMemory + "M\" >> " + JVM_OPTIONS) - .run("echo \"-Xmx" + cassandraMemory + "M\" >> " + JVM_OPTIONS) - .build())) + cassandraContainer = new GenericContainer<>("cassandra:3.11.3") .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig().withTmpFs(ImmutableMap.of("/var/lib/cassandra", "rw,noexec,nosuid,size=200m"))) - .withCreateContainerCmdModifier(cmd -> cmd.withMemory(cassandraContainerMemory)) .withExposedPorts(CASSANDRA_PORT) .withLogConsumer(DockerCassandra::displayDockerLog); cassandraContainer --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
