summaryrefslogtreecommitdiffstats
path: root/ci/kolla-build-vm.sh
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2018-01-04 17:11:43 -0500
committerZhijiang Hu <hu.zhijiang@zte.com.cn>2018-01-04 17:52:40 -0500
commit9da43ddfc09e56b772e4304eef430e56aaf6013e (patch)
tree774ef7783c4cd04f1a765433d8ff4b07b196cca6 /ci/kolla-build-vm.sh
parent6fecb3948338c57cdd72c9c37491f4aabacd4f26 (diff)
Fix tmp dir security risks in image build code
Change-Id: I2b909101ead10e26d2ec00a0ba3eb4ca63dc226a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Diffstat (limited to 'ci/kolla-build-vm.sh')
-rwxr-xr-xci/kolla-build-vm.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/ci/kolla-build-vm.sh b/ci/kolla-build-vm.sh
index 63117242..011537ad 100755
--- a/ci/kolla-build-vm.sh
+++ b/ci/kolla-build-vm.sh
@@ -20,7 +20,12 @@ KOLLA_TAG=
EXT_TAG=
KOLLA_GIT_VERSION=
KOLLA_IMAGE_VERSION=
-WORK_DIR=/tmp
+
+SCRIPT_PATH=$(readlink -f $(dirname $0))
+WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd)
+
+WORK_DIR=$WORKSPACE
+
REGISTRY_SERVER_NAME=daisy-registry
function usage
@@ -45,7 +50,7 @@ sudo `basename $0` -l https://git.openstack.org/openstack/kolla
-j daisy-docker-build-euphrates
-t 4.0.2
-e .1
- -w /tmp
+ -w /path/to/the/working/dir
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
EOF
}
@@ -220,8 +225,8 @@ function cleanup_kolla_image {
function start_registry_server {
echo "Starting registry server"
sudo docker run -d -p 5000:5000 --restart=always \
- -e REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/tmp/registry \
- -v $REGISTRY_VOLUME_DIR:/tmp/registry \
+ -e REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/home/registry \
+ -v $REGISTRY_VOLUME_DIR:/home/registry \
--name $REGISTRY_SERVER_NAME registry:2
}