diff options
author | 2018-09-04 21:02:27 +0800 | |
---|---|---|
committer | 2018-09-06 14:58:45 +0800 | |
commit | e32043f58a2450b6a5986dc2a01f64f8b22c3992 (patch) | |
tree | 650f6ce0381e53c3ca935025e9121f06725efd5d /testing-scheduler/docker/server | |
parent | a09bbea983aca3e437e254566da98196177748d9 (diff) |
Change naming and veriy test-scheduler function
Changes:
1. Testing-scheduler -> Test-scheduler
2. lots of windows breaks '\r' and '^M' in files,
batch changes to unix breaks '$'
3. Add ui/build
Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba
Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'testing-scheduler/docker/server')
-rw-r--r-- | testing-scheduler/docker/server/Dockerfile | 29 | ||||
-rw-r--r-- | testing-scheduler/docker/server/build.sh | 20 | ||||
-rw-r--r-- | testing-scheduler/docker/server/clean.sh | 17 | ||||
-rw-r--r-- | testing-scheduler/docker/server/run.sh | 17 |
4 files changed, 0 insertions, 83 deletions
diff --git a/testing-scheduler/docker/server/Dockerfile b/testing-scheduler/docker/server/Dockerfile deleted file mode 100644 index e04873ea..00000000 --- a/testing-scheduler/docker/server/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-FROM python:2.7
-MAINTAINER x-lab/Leo
-WORKDIR /home/testing-scheduler/server
-COPY ./server .
-
-RUN pip install -r ./python_modules.txt
-
-ENV CONDUCTOR_DIR /home/testing-scheduler/conductor
-RUN mkdir ${CONDUCTOR_DIR} && cd ${CONDUCTOR_DIR} && \
- git clone http://github.com/Netflix/conductor.git && \
- cd conductor && git checkout v1.10.4
-RUN cd ${CONDUCTOR_DIR}/conductor/client/python && \
- python setup.py install
-
-RUN pip install -U .
-
-EXPOSE 5310
-EXPOSE 5312
-CMD sh -c 'python /usr/local/lib/python2.7/site-packages/src/rest/router.py & \
- python ./src/rest/test_service_demo.py'
diff --git a/testing-scheduler/docker/server/build.sh b/testing-scheduler/docker/server/build.sh deleted file mode 100644 index 27f6de33..00000000 --- a/testing-scheduler/docker/server/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# get the absolute path of this shell file.
-basepath=$(cd `dirname $0`; pwd)
-
-# get the root directory of this project
-projectpath=$basepath/../..
-group="x-lab"
-
-# server image name
-server_image="$group/testing-scheduler:server"
-
-docker build -t $server_image -f $basepath/Dockerfile $projectpath
\ No newline at end of file diff --git a/testing-scheduler/docker/server/clean.sh b/testing-scheduler/docker/server/clean.sh deleted file mode 100644 index 900326be..00000000 --- a/testing-scheduler/docker/server/clean.sh +++ /dev/null @@ -1,17 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-group="x-lab"
-# server image name
-server_image="$group/testing-scheduler:server"
-# server container name
-server_container="t-scheduler-server"
-
-docker rm -f $server_container
-docker rmi $server_image
\ No newline at end of file diff --git a/testing-scheduler/docker/server/run.sh b/testing-scheduler/docker/server/run.sh deleted file mode 100644 index d486f869..00000000 --- a/testing-scheduler/docker/server/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-conductor_network='conductor_default'
-group="x-lab"
-# server image name
-server_image="$group/testing-scheduler:server"
-# server container name
-server_container="t-scheduler-server"
-
-docker run -d --rm -p 5310:5310 -p 5312:5312 --net=$conductor_network --name $server_container $server_image
\ No newline at end of file |