diff options
Diffstat (limited to 'test-scheduler/docker')
| -rw-r--r-- | test-scheduler/docker/clean.sh | 4 | ||||
| -rw-r--r-- | test-scheduler/docker/plugin/build.sh | 1 | ||||
| -rw-r--r-- | test-scheduler/docker/ui/pre-builder/Dockerfile | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/test-scheduler/docker/clean.sh b/test-scheduler/docker/clean.sh index cab7a1b0..bcb4d89f 100644 --- a/test-scheduler/docker/clean.sh +++ b/test-scheduler/docker/clean.sh @@ -7,6 +7,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +basepath=$(cd `dirname $0`; pwd) + sudo docker rm -f t-scheduler-server \ t-scheduler-ui \ conductor_conductor-server_1 \ @@ -29,4 +31,6 @@ sudo docker rmi x-lab/test-scheduler:server \ nginx:latest \ java:latest \ +sudo rm -rf ${basepath}/plugin/tmp_files/ + echo "--- Clean Finished ---" 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 |