From b3ea590166fb3c34c973e107ce86d1c70c6befe0 Mon Sep 17 00:00:00 2001
From: "mathieu.brunot" <mb.mathieu.brunot@gmail.com>
Date: Fri, 15 Feb 2019 20:27:52 +0100
Subject: [PATCH] :construction: :green_heart: Remove JDK 10 and 11 and
 parallel CI

---
 .travis.yml        | 23 ++++++++++-------------
 docker-compose.yml |  8 ++++----
 manage.sh          | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 940b718f4..7d3726de7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,6 @@ sudo: required
 lein: lein
 jdk:
   - openjdk8
-  - openjdk10
-  - openjdk11
 services:
   - docker
 
@@ -17,20 +15,13 @@ branches:
     - develop
 
 install:
-  - ./manage.sh build
+  - ./manage.sh help
 
 before_script:
   - env | sort
 
 script:
-  - cd ./frontend
-  - ./scripts/build-tests
-  - nvm install $NODE_VERSION
-  - node --version
-  - node ./out/tests.js
-  - cd ..
-  - ./manage.sh release-local
-  - ./manage.sh release-docker
+  - ./manage.sh $COMMAND
 
 after_script:
   - docker images
@@ -40,5 +31,11 @@ notifications:
   email: false
 
 env:
-  - NODE_VERSION=7.7.1
-  - NODE_VERSION=10.15.1
+  - NODE_VERSION=7.7.1 COMMAND=build
+  - NODE_VERSION=7.7.1 COMMAND=test
+  - NODE_VERSION=7.7.1 COMMAND=release-local
+  - NODE_VERSION=7.7.1 COMMAND=release-docker
+  - NODE_VERSION=10.15.1 COMMAND=build
+  - NODE_VERSION=10.15.1 COMMAND=test
+  - NODE_VERSION=10.15.1 COMMAND=release-local
+  - NODE_VERSION=10.15.1 COMMAND=release-docker
diff --git a/docker-compose.yml b/docker-compose.yml
index 544035442..1fbf3ae49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,8 @@ services:
             - uxbox_db:/var/lib/postgresql/data
 
     uxbox_backend:
-        build: ./backend-docker
-        #image: Monogramm/uxbox-backend
+        build: ./backend
+        #image: monogramm/uxbox:backend
         restart: always
         depends_on:
             - uxbox_postgres
@@ -51,8 +51,8 @@ services:
             - "UXBOX_DB_PORT=5432"
 
     uxbox_frontend:
-        build: ./frontend-docker
-        #image: Monogramm/uxbox-frontend
+        build: ./frontend
+        #image: monogramm/uxbox:frontend
         restart: always
         depends_on:
             - uxbox_backend
diff --git a/manage.sh b/manage.sh
index 300906b14..5dedb45f1 100755
--- a/manage.sh
+++ b/manage.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -ex
 
 REV=`git rev-parse --short HEAD`
 IMGNAME="uxbox"
@@ -34,6 +35,18 @@ function run_image {
          -p 3449:3449 -p 6060:6060 -p 9090:9090 $IMGNAME:$REV
 }
 
+function test {
+    kill_container
+
+    echo "Testing frontend..."
+    cd ./frontend
+    ./scripts/build-tests
+    nvm install $NODE_VERSION
+    node --version
+    node ./out/tests.js
+    cd ..
+}
+
 function release_local {
     cd frontend
     echo "Building frontend release..."
@@ -67,8 +80,20 @@ function release_image {
     echo "Backend release image generated"
 }
 
+function run_release {
+    kill_container
+
+    if ! $(sudo docker images | grep $IMGNAME-frontend | grep -q $REV); then
+        release_image
+    fi
+
+    echo "Running development image..."
+    sudo docker-compose up -d
+}
+
 function usage {
-    echo "USAGE: $0 [ build | run | release-local | release-docker ]"
+    echo "UXBOX build & release manager v$REV"
+    echo "USAGE: $0 [ build | run | test | release-local | release-docker | run-release ]"
 }
 
 case $1 in
@@ -78,12 +103,18 @@ case $1 in
     run)
         run_image
         ;;
+    test)
+        test
+        ;;
     release-local)
         release_local
         ;;
     release-docker)
         release_image
         ;;
+    run-release)
+        run_release
+        ;;
     *)
         usage
         ;;