From 7324592f1f2c0917405520b24b079985a0786186 Mon Sep 17 00:00:00 2001
From: "mathieu.brunot" <mb.mathieu.brunot@gmail.com>
Date: Fri, 15 Feb 2019 18:52:02 +0100
Subject: [PATCH] :construction: :green_heart: Fix release build

---
 .travis.yml         |  7 +++++--
 backend/Dockerfile  |  2 +-
 frontend/Dockerfile | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b8401899a..940b718f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,10 +23,12 @@ before_script:
   - env | sort
 
 script:
-  - ./frontend/scripts/build-tests
+  - cd ./frontend
+  - ./scripts/build-tests
   - nvm install $NODE_VERSION
   - node --version
-  - node ./frontend/out/tests.js
+  - node ./out/tests.js
+  - cd ..
   - ./manage.sh release-local
   - ./manage.sh release-docker
 
@@ -39,3 +41,4 @@ notifications:
 
 env:
   - NODE_VERSION=7.7.1
+  - NODE_VERSION=10.15.1
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 519c99559..16a5975f9 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -5,8 +5,8 @@ ENV LEIN_ROOT=TRUE
 # Copy backend source and build release
 COPY . /home/uxbox/backend
 RUN set -ex; \
-    rm -f Dockerfile docker-entrypoint.sh; \
     cd backend; \
+    rm -f Dockerfile docker-entrypoint.sh; \
     bash -c "/home/uxbox/backend/scripts/dist.sh"
 
 
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 553a05bce..44c9bd322 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -6,17 +6,17 @@ ENV LEIN_ROOT=TRUE
 # Copy frontend source and build release
 COPY . /home/uxbox/frontend
 RUN set -ex; \
-    rm -f Dockerfile; \
     cd frontend; \
+    rm -f Dockerfile; \
+    rm -rf ./dist ./node_modules; \
     sed -i \
         -e 's|"uxbox.config.url" ".*"|"uxbox.config.url" "${API_URL}/api"|g' \
         scripts/figwheel.clj; \
     npm install; \
     npm run dist; \
-    ./scripts/dist-main; \
-    ./scripts/dist-view; \
-    ./scripts/dist-worker; \
-    rm -rf ./dist/**/*.gz ./dist/**/*.br
+    bash -c "/home/uxbox/frontend/scripts/dist-main"; \
+    bash -c "/home/uxbox/frontend/scripts/dist-view"; \
+    bash -c "/home/uxbox/frontend/scripts/dist-worker"