From 135a65d7947c1729e86aeaa5a5b2837665927320 Mon Sep 17 00:00:00 2001 From: Qibin Zheng Date: Mon, 14 Jan 2019 15:44:37 +0800 Subject: 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 --- test-scheduler/docker/plugin/build.sh | 1 + test-scheduler/docker/ui/pre-builder/Dockerfile | 1 + 2 files changed, 2 insertions(+) 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 -- cgit 1.2.3-korg