diff options
| author |   Qibin Zheng <QibinZheng2014@tongji.edu.cn> | 2019-01-14 15:44:37 +0800 |
|---|---|---|
| committer |   Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> | 2019-01-29 01:20:49 +0000 |
| commit | 41ef8012ad335af314aa2e71f6d9b2c13198051c (patch) | |
| tree | 3084b6fda8679203f782e5d3cadd472d7c0cdbf6 | |
| parent | 99b80f47256141dbe2f95f63fbed0d9c79759e0d (diff) | |
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>
(cherry picked from commit 135a65d7947c1729e86aeaa5a5b2837665927320)
| -rw-r--r-- | test-scheduler/docker/plugin/build.sh | 1 | ||||
| -rw-r--r-- | test-scheduler/docker/ui/pre-builder/Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test-scheduler/docker/plugin/build.sh b/test-scheduler/docker/plugin/build.sh index d5523b49..079f2d1e 100644 --- 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 92fbda32..4144ce2e 100644 --- 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 |