You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/10/29 04:41:21 UTC
[camel] 01/02: Upgrade consul docker image
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 220d5f796723a5559f8aceb86937617f0ba98256
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Oct 29 05:25:06 2019 +0100
Upgrade consul docker image
---
.../test/java/org/apache/camel/component/consul/ConsulTestSupport.java | 2 +-
.../camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java | 2 +-
.../testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java | 2 +-
.../test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java | 2 +-
.../apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java | 2 +-
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
examples/camel-example-spring-cloud-serviceregistry/README.adoc | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index 2fecc6d..4bb9627 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -29,7 +29,7 @@ import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
- public static final String CONTAINER_IMAGE = "consul:1.5.3";
+ public static final String CONTAINER_IMAGE = "consul:1.6.1";
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
diff --git a/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java b/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
index b085e9d..bd52c1b 100644
--- a/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
+++ b/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
@@ -34,7 +34,7 @@ public class ContainerAwareTestSupportIT extends ContainerAwareTestSupport {
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer<>("consul:1.5.3")
+ return new GenericContainer<>("consul:1.6.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
index 10553a6..21ea214 100644
--- a/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
+++ b/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
@@ -42,7 +42,7 @@ public class ContainerAwareSpringTestSupportIT extends ContainerAwareSpringTestS
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer("consul:1.5.3")
+ return new GenericContainer("consul:1.6.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
index 7cd0522..1cf4b84 100644
--- a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
+++ b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
@@ -42,7 +42,7 @@ public class ContainerAwareSpringTestSupportIT extends ContainerAwareSpringTestS
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer("consul:1.5.3")
+ return new GenericContainer("consul:1.6.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
index ec8d402f..9a5fd35 100644
--- a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
+++ b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
@@ -34,7 +34,7 @@ public class ContainerAwareTestSupportIT extends ContainerAwareTestSupport {
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer<>("consul:1.5.3")
+ return new GenericContainer<>("consul:1.6.1")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
index 373da1d..c254bab 100755
--- a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
+++ b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
@@ -17,7 +17,7 @@
#
-CONSUL_VER="1.5.1"
+CONSUL_VER="1.6.1"
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
index 665db6c..d41e1c9 100755
--- a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
+++ b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
@@ -17,7 +17,7 @@
#
-CONSUL_VER="1.5.1"
+CONSUL_VER="1.6.1"
CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-cloud-serviceregistry/README.adoc b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
index 547613f..d4c04f8 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/README.adoc
+++ b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
@@ -24,7 +24,7 @@ Using multiple shells:
- start consul:
docker run --rm -ti --publish 8500:8500 \
- consul:1.5.3 \
+ consul:1.6.1 \
agent \
-dev \
-server \