Fix test-scheduler build bugs.

JIRA: BOTTLENECK-249

1. set the conductor version at v1.10.4
2. conductor ui container: update natives to the version 1.1.6
3. scheduler ui container: update the npm to the version 6.7.0

Change-Id: I1ed975f79ce1696a59474a15c721db40509550a1
Signed-off-by: Qibin Zheng <QibinZheng2014@tongji.edu.cn>

diff --git a/test-scheduler/docker/plugin/build.sh b/test-scheduler/docker/plugin/build.sh
index d5523b4..079f2d1 100644 (file)
--- a/test-scheduler/docker/plugin/build.sh
+++ b/test-scheduler/docker/plugin/build.sh
@@ -25,4 +25,5 @@ docker rm -f $plugin_container
 
 #build the images of conductor.
 cd $tmppath/conductor/docker
+sed -i '/&& npm install/a\  && npm i natives@1.1.6 -S \\' ui/Dockerfile
 docker-compose build

diff --git a/test-scheduler/docker/ui/pre-builder/Dockerfile b/test-scheduler/docker/ui/pre-builder/Dockerfile
index 92fbda3..4144ce2 100644 (file)
--- a/test-scheduler/docker/ui/pre-builder/Dockerfile
+++ b/test-scheduler/docker/ui/pre-builder/Dockerfile
@@ -12,6 +12,7 @@ MAINTAINER x-lab/Leo
 WORKDIR /home/test-scheduler/ui
 COPY ./ui .
 
+RUN npm install npm@6.7.0 -g
 RUN npm install
 RUN npm run build