Merge "Update links to documentation in README.rst"

[yardstick.git] / install.sh

diff --git a/install.sh b/install.sh
index 3e151db..dfad3a5 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -59,6 +59,7 @@ echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf
 # install tools
 apt-get update && apt-get install -y \
     qemu-user-static/xenial \
+    bonnie++ \
     wget \
     expect \
     curl \
@@ -78,7 +79,9 @@ apt-get update && apt-get install -y \
     uwsgi-plugin-python \
     supervisor \
     python-pip \
-    vim
+    vim \
+    libxft-dev \
+    libxss-dev
 
 if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then
     apt-get install -y libc6:arm64
@@ -94,7 +97,11 @@ easy_install -U pip
 pip install -r requirements.txt
 pip install -e .
 
-/bin/bash "$(pwd)/api/api-prepare.sh"
+/bin/bash "${PWD}/docker/uwsgi.sh"
+/bin/bash "${PWD}/docker/nginx.sh"
+cd "${PWD}/gui" && /bin/bash gui.sh
+mkdir -p /etc/nginx/yardstick
+mv dist /etc/nginx/yardstick/gui
 
 service nginx restart
 uwsgi -i /etc/yardstick/yardstick.ini