You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/12/05 07:30:58 UTC
[18/19] james-project git commit: JAMES-2242 Factorize and centralize
docker images definitions
JAMES-2242 Factorize and centralize docker images definitions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/62b00ebf
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/62b00ebf
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/62b00ebf
Branch: refs/heads/master
Commit: 62b00ebf4b1c10a7372aed20ef55e810b6b857f9
Parents: 992a4d0
Author: benwa <bt...@linagora.com>
Authored: Mon Dec 4 18:12:03 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 4 14:42:23 2017 +0100
----------------------------------------------------------------------
.../james/mailbox/tika/TikaContainer.java | 3 ++-
.../apache/james/DockerElasticSearchRule.java | 3 ++-
.../apache/james/metric/es/ESReporterTest.java | 3 ++-
.../james/util/streams/ContainerNames.java | 28 ++++++++++++++++++++
.../GatewayRemoteDeliveryIntegrationTest.java | 3 ++-
.../mailets/AmqpForwardAttachmentTest.java | 3 ++-
.../transport/mailets/ContactExtractorTest.java | 3 ++-
.../transport/mailets/GroupMappingTest.java | 3 ++-
.../mailets/ICSAttachmentWorkflowTest.java | 3 ++-
.../org/apache/james/jmap/ContainerTest.java | 3 ++-
.../jmap/VacationRelayIntegrationTest.java | 3 ++-
11 files changed, 48 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
----------------------------------------------------------------------
diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
index 82ac712..adb451b 100644
--- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
+++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaContainer.java
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.tika;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.junit.rules.ExternalResource;
import org.testcontainers.containers.wait.Wait;
@@ -35,7 +36,7 @@ public class TikaContainer extends ExternalResource {
private final SwarmGenericContainer tika;
public TikaContainer() {
- tika = new SwarmGenericContainer("logicalspark/docker-tikaserver:1.15rc2")
+ tika = new SwarmGenericContainer(ContainerNames.TIKA)
.withExposedPorts(DEFAULT_TIKA_PORT)
.waitingFor(Wait.forHttp("/tika"))
.withStartupTimeout(Duration.ofSeconds(30));
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
index 85171ba..06b5d44 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -22,6 +22,7 @@ package org.apache.james;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.james.modules.mailbox.ElasticSearchConfiguration;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -59,7 +60,7 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
}
}
- private SwarmGenericContainer elasticSearchContainer = new SwarmGenericContainer("elasticsearch:2.2.2")
+ private SwarmGenericContainer elasticSearchContainer = new SwarmGenericContainer(ContainerNames.ELASTICSEARCH)
.withExposedPorts(ELASTIC_SEARCH_HTTP_PORT, ELASTIC_SEARCH_PORT);
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java
----------------------------------------------------------------------
diff --git a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java
index 2878e90..3cd77bd 100644
--- a/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java
+++ b/server/container/metrics/metrics-es-reporter/src/test/java/org/apache/james/metric/es/ESReporterTest.java
@@ -31,6 +31,7 @@ import org.apache.james.metrics.api.TimeMetric;
import org.apache.james.metrics.dropwizard.DropWizardMetricFactory;
import org.apache.james.metrics.es.ESMetricReporter;
import org.apache.james.metrics.es.ESReporterConfiguration;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.elasticsearch.client.Client;
import org.elasticsearch.index.query.QueryBuilders;
@@ -52,7 +53,7 @@ public class ESReporterTest {
public static final int ES_HTTP_PORT = 9200;
@Rule
- public SwarmGenericContainer esContainer = new SwarmGenericContainer("elasticsearch:2.2.2")
+ public SwarmGenericContainer esContainer = new SwarmGenericContainer(ContainerNames.ELASTICSEARCH)
.withAffinityToContainer()
.withExposedPorts(ES_HTTP_PORT, ES_APPLICATIVE_PORT);
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/container/util-java8/src/test/java/org/apache/james/util/streams/ContainerNames.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/streams/ContainerNames.java b/server/container/util-java8/src/test/java/org/apache/james/util/streams/ContainerNames.java
new file mode 100644
index 0000000..908cea2
--- /dev/null
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/streams/ContainerNames.java
@@ -0,0 +1,28 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.util.streams;
+
+public interface ContainerNames {
+ String FAKE_SMTP = "weave/rest-smtp-sink:latest";
+ String RABBITMQ = "rabbitmq:3";
+ String ELASTICSEARCH = "elasticsearch:2.2.2";
+ String NGINX = "nginx:1.7.1";
+ String TIKA = "logicalspark/docker-tikaserver:1.15rc2";
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 8c9e63a..9094ab6 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -52,6 +52,7 @@ import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.RelayLimit;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -100,7 +101,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
public TemporaryFolder temporaryFolder = new TemporaryFolder();
private final TemporaryFolder smtpFolder = new TemporaryFolder();
- private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
+ private final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(ContainerNames.FAKE_SMTP)
.withExposedPorts(25)
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy());
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
index 04471a0..0b19dd4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -36,6 +36,7 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -73,7 +74,7 @@ public class AmqpForwardAttachmentTest {
private static final byte[] TEST_ATTACHMENT_CONTENT = "Test attachment content".getBytes(Charsets.UTF_8);
- public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer("rabbitmq:3")
+ public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(ContainerNames.RABBITMQ)
.withAffinityToContainer();
public TemporaryFolder temporaryFolder = new TemporaryFolder();
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 16ef6a8..34c9a36 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -36,6 +36,7 @@ import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.SMTPAuthSuccessful;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -66,7 +67,7 @@ public class ContactExtractorTest {
public static final String EXCHANGE = "collector:email";
public static final String ROUTING_KEY = "";
- public SwarmGenericContainer rabbit = new SwarmGenericContainer("rabbitmq:3");
+ public SwarmGenericContainer rabbit = new SwarmGenericContainer(ContainerNames.RABBITMQ);
public AmqpRule amqpRule = new AmqpRule(rabbit, EXCHANGE, ROUTING_KEY);
public TemporaryFolder folder = new TemporaryFolder();
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index 0222ce0..c9f36f9 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -44,6 +44,7 @@ import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.RelayLimit;
import org.apache.james.transport.matchers.SMTPAuthSuccessful;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -90,7 +91,7 @@ public class GroupMappingTest {
private RequestSpecification restApiRequest;
@Rule
- public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
+ public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(ContainerNames.FAKE_SMTP)
.withExposedPorts(25)
.withAffinityToContainer()
.waitingFor(new HostPortWaitStrategy());
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index e44853e..56e80f3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -39,6 +39,7 @@ import org.apache.james.probe.DataProbe;
import org.apache.james.transport.mailets.amqp.AmqpRule;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.RecipientIsLocal;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
@@ -434,7 +435,7 @@ public class ICSAttachmentWorkflowTest {
"END:VCALENDAR\r\n" +
"";
- public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer("rabbitmq:3")
+ public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(ContainerNames.RABBITMQ)
.withAffinityToContainer();
public TemporaryFolder temporaryFolder = new TemporaryFolder();
public AmqpRule amqpRule = new AmqpRule(rabbitMqContainer, EXCHANGE_NAME, ROUTING_KEY);
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
index a403ed1..2bd0288 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ContainerTest.java
@@ -26,6 +26,7 @@ import java.net.URISyntaxException;
import org.apache.http.client.fluent.Request;
import org.apache.http.client.fluent.Response;
import org.apache.http.client.utils.URIBuilder;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.junit.Rule;
import org.junit.Test;
@@ -34,7 +35,7 @@ import org.testcontainers.containers.wait.HttpWaitStrategy;
public class ContainerTest {
@Rule
- public SwarmGenericContainer container = new SwarmGenericContainer("nginx:1.7.1")
+ public SwarmGenericContainer container = new SwarmGenericContainer(ContainerNames.NGINX)
.withAffinityToContainer()
.withExposedPorts(80)
.waitingFor(new HttpWaitStrategy().forStatusCode(200));
http://git-wip-us.apache.org/repos/asf/james-project/blob/62b00ebf/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
index a750699..f0b9108 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java
@@ -36,6 +36,7 @@ import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.modules.MailboxProbeImpl;
import org.apache.james.probe.DataProbe;
+import org.apache.james.util.streams.ContainerNames;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.JmapGuiceProbe;
@@ -66,7 +67,7 @@ public abstract class VacationRelayIntegrationTest {
private static final int REST_SMTP_SINK_PORT = 25;
@Rule
- public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
+ public final SwarmGenericContainer fakeSmtp = new SwarmGenericContainer(ContainerNames.FAKE_SMTP)
.withExposedPorts(REST_SMTP_SINK_PORT)
.waitingFor(new HostPortWaitStrategy());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org