Merge pull request #26 from dartpopikyardo/master

Сonverted all docker-compose files to use build: rather than volumes
2016-10-26 06:43:08 -07:00
parent f750d9c01a d168a8be2b
commit 083047cd81
17 changed files with 69 additions and 72 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-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java
+++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateService.java
@@ -1,6 +1,7 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;

 import com.mongodb.WriteResult;
+import io.eventuate.Int128;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountChangeInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.accounts.AccountTransactionInfo;
 import net.chrisrichardson.eventstore.javaexamples.banking.common.transactions.TransferState;
@@ -29,7 +30,7 @@ public class AccountInfoUpdateService {
  }


-  public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, String version) {
+  public void create(String accountId, String customerId, String title, BigDecimal initialBalance, String description, Int128 version) {
    try {
      AccountChangeInfo ci = new AccountChangeInfo();
      ci.setAmount(toIntegerRepr(initialBalance));
@@ -40,8 +41,8 @@ public class AccountInfoUpdateService {
                      .set("description", description)
                      .set("balance", toIntegerRepr(initialBalance))
                      .push("changes", ci)
-                      .set("creationDate", getFromEventId(version))
-                      .set("version", version),
+                      .set("creationDate", new Date(version.getHi()))
+                      .set("version", version.asString()),
              AccountInfo.class);
      logger.info("Saved in mongo");

@@ -81,12 +82,4 @@ public class AccountInfoUpdateService {
                      set("transactions." + transactionId + ".status", status),
              AccountInfo.class);
  }
-
-  private Date getFromEventId(String eventId) {
-    String[] s = eventId.split("-");
-    if (s.length != 2) {
-      return new Date();
-    }
-    return new Date(Long.parseUnsignedLong(s[0], 16));
-  }
 }
--- a/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java
+++ b/java-spring/accounts-query-side-backend/src/main/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountQueryWorkflow.java
@@ -3,6 +3,7 @@ package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.ac
 import io.eventuate.DispatchedEvent;
 import io.eventuate.EventHandlerMethod;
 import io.eventuate.EventSubscriber;
+import io.eventuate.Int128;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.accounts.*;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.CreditRecordedEvent;
 import net.chrisrichardson.eventstore.javaexamples.banking.backend.common.transactions.DebitRecordedEvent;
@@ -34,7 +35,7 @@ public class AccountQueryWorkflow {
  public void create(DispatchedEvent<AccountOpenedEvent> de) {
    AccountOpenedEvent event = de.getEvent();
    String id = de.getEntityId();
-    String eventId = de.getEventId().asString();
+    Int128 eventId = de.getEventId();
    logger.info("**************** account version=" + id + ", " + eventId);
    BigDecimal initialBalance = event.getInitialBalance();

@@ -57,8 +58,8 @@ public class AccountQueryWorkflow {
    String moneyTransferId = de.getEntityId();
    String fromAccountId = de.getEvent().getDetails().getFromAccountId();
    String toAccountId = de.getEvent().getDetails().getToAccountId();
-    logger.info("**************** account version=" + fromAccountId + ", " + de.getEventId().asString());
-    logger.info("**************** account version=" + toAccountId + ", " + de.getEventId().asString());
+    logger.info("**************** account version=" + fromAccountId + ", " + eventId);
+    logger.info("**************** account version=" + toAccountId + ", " + eventId);

    AccountTransactionInfo ti = new AccountTransactionInfo(moneyTransferId,
            fromAccountId,
--- a/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java
+++ b/java-spring/accounts-query-side-backend/src/test/java/net/chrisrichardson/eventstore/javaexamples/banking/backend/queryside/accounts/AccountInfoUpdateServiceTest.java
@@ -1,5 +1,6 @@
 package net.chrisrichardson.eventstore.javaexamples.banking.backend.queryside.accounts;

+import io.eventuate.Int128;
 import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
 import io.eventuate.javaclient.spring.jdbc.IdGenerator;
 import io.eventuate.javaclient.spring.jdbc.IdGeneratorImpl;
@@ -46,7 +47,7 @@ public class AccountInfoUpdateServiceTest {
    IdGenerator x = new IdGeneratorImpl();
    String accountId = x.genId().asString();
    String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();

    String title = "Checking account";
    BigDecimal initialBalance = new BigDecimal("1345");
@@ -63,7 +64,7 @@ public class AccountInfoUpdateServiceTest {
    assertEquals(initialBalance.longValue() * 100, accountInfo.getBalance());
    assertEquals(1, accountInfo.getChanges().size());
    assertTrue(accountInfo.getTransactions().isEmpty());
-    assertEquals(version, accountInfo.getVersion());
+    assertEquals(version.asString(), accountInfo.getVersion());


    String changeId = x.genId().asString();
@@ -99,7 +100,7 @@ public class AccountInfoUpdateServiceTest {
    IdGenerator x = new IdGeneratorImpl();
    String accountId = x.genId().asString();
    String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();

    String title = "Checking account";
    BigDecimal initialBalance = new BigDecimal("1345");
@@ -114,7 +115,7 @@ public class AccountInfoUpdateServiceTest {
    IdGenerator x = new IdGeneratorImpl();
    String accountId = x.genId().asString();
    String customerId = x.genId().asString();
-    String version = x.genId().asString();
+    Int128 version = x.genId();

    String title = "Checking account";
    BigDecimal initialBalance = new BigDecimal("1345");
--- 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/gradle.properties
+++ b/java-spring/gradle.properties
@@ -5,5 +5,5 @@ eventuateMavenRepoUrl=http://mavenrepo.eventuate.io/release

 springBootVersion=1.3.5.RELEASE

-eventuateClientVersion=0.10.0.RELEASE
+eventuateClientVersion=0.12.0.RELEASE
 eventuateLocalVersion=0.4.0.RELEASE
--- 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 .