Merge branch 'wip-customer'

2016-10-25 17:44:25 +03:00
parent f750d9c01a 909ad5fea9
commit 1fbd1be4b8
13 changed files with 55 additions and 53 deletions
--- a/_build-and-test-all.sh
+++ b/_build-and-test-all.sh
@@ -2,6 +2,17 @@

 set -e

+if [ -z "$DOCKER_HOST_IP" ] ; then
+  if [ -z "$DOCKER_HOST" ] ; then
+    export DOCKER_HOST_IP=`hostname`
+  else
+    echo using ${DOCKER_HOST?}
+    XX=${DOCKER_HOST%\:*}
+    export DOCKER_HOST_IP=${XX#tcp\:\/\/}
+  fi
+  echo set DOCKER_HOST_IP $DOCKER_HOST_IP
+fi
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 DOCKER_COMPOSE="docker-compose -p event-sourcing-examples"
@@ -28,14 +39,6 @@ fi

 ${DOCKER_COMPOSE?} up -d mongodb $EXTRA_INFRASTRUCTURE_SERVICES

-if [ -z "$DOCKER_HOST_IP" ] ; then
-  if which docker-machine >/dev/null; then
-    export DOCKER_HOST_IP=$(docker-machine ip default)
-  else
-    export DOCKER_HOST_IP=localhost
- fi
- echo set DOCKER_HOST_IP $DOCKER_HOST_IP
-fi

 if [ -z "$SPRING_DATA_MONGODB_URI" ] ; then
  export SPRING_DATA_MONGODB_URI=mongodb://${DOCKER_HOST_IP?}/mydb
@@ -46,11 +49,12 @@ export SERVICE_HOST=$DOCKER_HOST_IP

 ./gradlew $* build -x :e2e-test:test

-if [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then
+if [ -z "$EVENTUATE_LOCAL" ] && [ -z "$EVENTUATE_API_KEY_ID" -o -z "$EVENTUATE_API_KEY_SECRET" ] ; then
  echo You must set EVENTUATE_API_KEY_ID and  EVENTUATE_API_KEY_SECRET
  exit -1
 fi

+${DOCKER_COMPOSE?} build

 ${DOCKER_COMPOSE?} up -d

--- a/java-spring/accounts-command-side-service/Dockerfile
+++ b/java-spring/accounts-command-side-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar accounts-command-side-service.jar
+EXPOSE 8080
+COPY build/libs/accounts-command-side-service.jar .
--- a/java-spring/accounts-query-side-service/Dockerfile
+++ b/java-spring/accounts-query-side-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar accounts-query-side-service.jar
+EXPOSE 8080
+COPY build/libs/accounts-query-side-service.jar .
--- a/java-spring/api-gateway-service/Dockerfile
+++ b/java-spring/api-gateway-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar api-gateway-service.jar
+EXPOSE 8080
+COPY build/libs/api-gateway-service.jar .
--- a/java-spring/api-gateway-service/src/main/resources/logback.xml
+++ b/java-spring/api-gateway-service/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
    <logger name="net.chrisrichardson.eventstore.javaexamples.banking" level='info'>
    </logger>

-    <logger name="io.eventuate" level='debug'>
+    <logger name="io.eventuate.activity" level='debug'>
    </logger>

 </configuration>
--- a/java-spring/build-and-test-all-eventuate-local.sh
+++ b/java-spring/build-and-test-all-eventuate-local.sh
@@ -2,4 +2,5 @@

 export JAVA_OPTS="-Xmx128m -Xms128m"
 export EXTRA_INFRASTRUCTURE_SERVICES=cdcservice
-../_build-and-test-all.sh -f docker-compose-eventuate-local.yml -P eventuateDriver=local $*
+export EVENTUATE_LOCAL=yes
+../_build-and-test-all.sh -f docker-compose-eventuate-local.yml $* -P eventuateDriver=local
--- a/java-spring/common-backend/src/main/resources/logback.xml
+++ b/java-spring/common-backend/src/main/resources/logback.xml
@@ -16,7 +16,7 @@
  <logger name="org.springframework" level='info'>
  </logger>

-  <logger name="io.eventuate" level='debug'>
+  <logger name="io.eventuate.activity" level='debug'>
  </logger>

 </configuration>
--- a/java-spring/customers-command-side-service/Dockerfile
+++ b/java-spring/customers-command-side-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar customers-command-side-service.jar
+EXPOSE 8080
+COPY build/libs/customers-command-side-service.jar .
--- a/java-spring/customers-query-side-service/Dockerfile
+++ b/java-spring/customers-query-side-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar customers-query-side-service.jar
+EXPOSE 8080
+COPY build/libs/customers-query-side-service.jar .
--- a/java-spring/docker-compose-common.yml
+++ b/java-spring/docker-compose-common.yml
@@ -1,40 +1,40 @@
 apigateway:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/api-gateway-service.jar --accounts.commandside.service.host=accountscommandside --transfers.commandside.service.host=transactionscommandside --accounts.queryside.service.host=accountsqueryside --customers.commandside.service.host=customerscommandside  --customers.queryside.service.host=customersqueryside
-  environment:
-    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+  build: ./api-gateway-service/
  ports:
    - "8080:8080"
+  environment:
+    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
+    ACCOUNTS_COMMANDSIDE_SERVICE_HOST: accountscommandside
+    TRANSFERS_COMMANDSIDE_SERVICE_HOST: transactionscommandside
+    ACCOUNTS_QUERYSIDE_SERVICE_HOST: accountsqueryside
+    CUSTOMERS_COMMANDSIDE_SERVICE_HOST: customerscommandside
+    CUSTOMERS_QUERYSIDE_SERVICE_HOST: customersqueryside
+

 accountscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/accounts-command-side-service.jar
+  build: ./accounts-command-side-service/
  ports:
    - "8085:8080"

 transactionscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/transactions-command-side-service.jar
+  build: ./transactions-command-side-service/
  ports:
    - "8082:8080"

 accountsqueryside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/accounts-query-side-service.jar
+  build: ./accounts-query-side-service/
  environment:
    SPRING_DATA_MONGODB_URI: mongodb://mongodb/mydb
  ports:
    - "8081:8080"

 customerscommandside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/customers-command-side-service.jar
+  build: ./customers-command-side-service/
  ports:
    - "8083:8080"

 customersqueryside:
-  image: java:openjdk-8u91-jdk
-  command: java ${JAVA_OPTS} -jar /app/customers-query-side-service.jar
+  build: ./customers-query-side-service/
  ports:
    - "8084:8080"
  environment:
--- a/java-spring/docker-compose-eventuate-local.yml
+++ b/java-spring/docker-compose-eventuate-local.yml
@@ -54,8 +54,6 @@ apigateway:
  extends:
    file: docker-compose-common.yml
    service: apigateway
-  volumes:
-    - ./api-gateway-service/build/libs:/app
  links:
    - accountscommandside
    - transactionscommandside
@@ -68,8 +66,6 @@ accountscommandside:
  extends:
    file: docker-compose-common.yml
    service: accountscommandside
-  volumes:
-    - ./accounts-command-side-service/build/libs:/app
  links:
    - mysql
    - kafka
@@ -89,8 +85,6 @@ transactionscommandside:
  extends:
    file: docker-compose-common.yml
    service: transactionscommandside
-  volumes:
-    - ./transactions-command-side-service/build/libs:/app
  links:
    - mysql
    - kafka
@@ -105,14 +99,10 @@ transactionscommandside:
    EVENTUATELOCAL_CDC_DB_USER_NAME: root
    EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword

-
-
 accountsqueryside:
  extends:
    file: docker-compose-common.yml
    service: accountsqueryside
-  volumes:
-    - ./accounts-query-side-service/build/libs:/app
  links:
    - mongodb
    - mysql
@@ -134,8 +124,6 @@ customerscommandside:
  extends:
    file: docker-compose-common.yml
    service: customerscommandside
-  volumes:
-    - ./customers-command-side-service/build/libs:/app
  links:
    - mysql
    - kafka
@@ -154,8 +142,6 @@ customersqueryside:
  extends:
    file: docker-compose-common.yml
    service: customersqueryside
-  volumes:
-    - ./customers-query-side-service/build/libs:/app
  links:
    - mongodb
    - mysql
--- a/java-spring/docker-compose.yml
+++ b/java-spring/docker-compose.yml
@@ -2,8 +2,6 @@ apigateway:
  extends:
    file: docker-compose-common.yml
    service: apigateway
-  volumes:
-    - ./api-gateway-service/build/libs:/app
  links:
    - accountscommandside
    - transactionscommandside
@@ -16,8 +14,6 @@ accountscommandside:
  extends:
    file: docker-compose-common.yml
    service: accountscommandside
-  volumes:
-    - ./accounts-command-side-service/build/libs:/app
  environment:
    EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
    EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -26,8 +22,6 @@ transactionscommandside:
  extends:
    file: docker-compose-common.yml
    service: transactionscommandside
-  volumes:
-    - ./transactions-command-side-service/build/libs:/app
  environment:
    EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
    EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -37,8 +31,6 @@ accountsqueryside:
  extends:
    file: docker-compose-common.yml
    service: accountsqueryside
-  volumes:
-    - ./accounts-query-side-service/build/libs:/app
  links:
    - mongodb
  environment:
@@ -49,8 +41,6 @@ customerscommandside:
  extends:
    file: docker-compose-common.yml
    service: customerscommandside
-  volumes:
-    - ./customers-command-side-service/build/libs:/app
  environment:
    EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
    EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
@@ -59,9 +49,6 @@ customersqueryside:
  extends:
    file: docker-compose-common.yml
    service: customersqueryside
-  image: java:openjdk-8u91-jdk
-  volumes:
-    - ./customers-query-side-service/build/libs:/app
  links:
    - mongodb
  environment:
--- a/java-spring/transactions-command-side-service/Dockerfile
+++ b/java-spring/transactions-command-side-service/Dockerfile
@@ -0,0 +1,4 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar transactions-command-side-service.jar
+EXPOSE 8080
+COPY build/libs/transactions-command-side-service.jar .