You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/07/12 10:29:26 UTC

[servicecomb-pack] branch master updated: SCB-1367 Fixed docker images version & Start log check

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 156ef0d  SCB-1367 Fixed docker images version & Start log check
156ef0d is described below

commit 156ef0d96654837536c71a8c36b003ca3c34c28e
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Fri Jul 12 09:52:16 2019 +0800

    SCB-1367 Fixed docker images version & Start log check
---
 acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml    | 3 +--
 acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml     | 5 ++---
 acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml
index c7eaf56..4ea2178 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-consul/pom.xml
@@ -93,10 +93,9 @@
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <showLogs>false</showLogs>
               <images>
                 <image>
-                  <name>consul</name>
+                  <name>consul:1.5</name>
                   <alias>consul</alias>
                   <run>
                     <wait>
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
index f558dd1..f015ac7 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
@@ -93,17 +93,16 @@
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <showLogs>true</showLogs>
               <images>
                 <image>
-                  <name>nacos/nacos-server</name>
+                  <name>nacos/nacos-server:1.1.0</name>
                   <alias>nacos</alias>
                   <run>
                     <env>
                       <MODE>standalone</MODE>
                     </env>
                     <wait>
-                      <log>Synced node info</log>
+                      <log>Completed initialization in</log>
                       <tcp>
                         <ports>
                           <port>8848</port>
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
index b3d2260..c4b059b 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
@@ -93,14 +93,13 @@
             <groupId>io.fabric8</groupId>
             <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <showLogs>true</showLogs>
               <images>
                 <image>
-                  <name>zookeeper</name>
+                  <name>zookeeper:3.5.5</name>
                   <alias>zookeeper</alias>
                   <run>
                     <wait>
-                      <log>Synced node info</log>
+                      <log>binding to port</log>
                       <tcp>
                         <ports>
                           <port>2181</port>