From 756daf7ba210c0546a8c9b0853d7afa8948c7c5d Mon Sep 17 00:00:00 2001
From: Chris Richardson <chris@chrisrichardson.net>
Date: Mon, 20 Nov 2017 13:46:50 -0800
Subject: [PATCH] Reordered build steps

---
 .circleci/config.yml        | 2 +-
 deploy-artifacts.sh         | 3 +++
 docker-compose-postgres.yml | 4 ++--
 docker-compose.yml          | 4 ++--
 mysql/Dockerfile            | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d06578f..9e18bc5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,8 +14,8 @@ jobs:
           key: eventuate-tram-core-{{ checksum "build.gradle" }}
       - run: TERM=dumb ./build-and-test-all.sh
       - run: TERM=dumb ./build-and-test-all-cdc.sh
-      - run: TERM=dumb ./build-and-test-all-cdc-postgres.sh
       - run: TERM=dumb ./build-and-test-all-postgres.sh
+      - run: TERM=dumb ./build-and-test-all-cdc-postgres.sh
       - run:
           name: Save test results
           command: |
diff --git a/deploy-artifacts.sh b/deploy-artifacts.sh
index 1872e8b8..952cf32f 100755
--- a/deploy-artifacts.sh
+++ b/deploy-artifacts.sh
@@ -21,6 +21,9 @@ function tagAndPush() {
   REMOTE=$2
   $PREFIX docker tag ${DOCKER_COMPOSE_PREFIX?}$LOCAL $DOCKER_REPO/$REMOTE:$VERSION
   $PREFIX docker tag ${DOCKER_COMPOSE_PREFIX?}$LOCAL $DOCKER_REPO/$REMOTE:latest
+  echo Pushing $DOCKER_REPO/$REMOTE:$VERSION
+  $PREFIX docker push $DOCKER_REPO/$REMOTE:$VERSION
+  $PREFIX docker push $DOCKER_REPO/$REMOTE:latest
 }
 
 $PREFIX docker login -u ${DOCKER_USER_ID?} -p ${DOCKER_PASSWORD?}
diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml
index 3d4da8f2..7f7d9cb1 100755
--- a/docker-compose-postgres.yml
+++ b/docker-compose-postgres.yml
@@ -1,12 +1,12 @@
 zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.10.0
+  image: eventuateio/eventuateio-local-zookeeper:0.15.0
   ports:
     - 2181:2181
     - 2888:2888
     - 3888:3888
 
 kafka:
-  image: eventuateio/eventuateio-local-kafka:0.10.0
+  image: eventuateio/eventuateio-local-kafka:0.15.0
   ports:
     - 9092:9092
   links:
diff --git a/docker-compose.yml b/docker-compose.yml
index 62c47f03..d65a5ec4 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 zookeeper:
-  image: eventuateio/eventuateio-local-zookeeper:0.14.0
+  image: eventuateio/eventuateio-local-zookeeper:0.15.0
   ports:
     - 2181:2181
     - 2888:2888
@@ -7,7 +7,7 @@ zookeeper:
 
 
 kafka:
-  image: eventuateio/eventuateio-local-kafka:0.14.0
+  image: eventuateio/eventuateio-local-kafka:0.15.0
   ports:
     - 9092:9092
   links:
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 866b0ee9..72b40975 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-mysql:0.14.0
+FROM eventuateio/eventuateio-local-mysql:0.15.0
 COPY schema.sql /docker-entrypoint-initdb.d