diff options
| author |   Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com> | 2018-06-22 16:04:14 +0100 |
|---|---|---|
| committer | Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com> | 2018-07-10 13:28:40 +0100 |
| commit | 5c414e6d7e1fd830021b3b89932bf187d0c7e5cf (patch) | |
| tree | 14b81fc464c4961d4cbab276a6bd5a0db5b27f3a /docker | |
| parent | 42b33dc3cba15a22214295770756c94f9be08f11 (diff) | |
Make uwsgi app to not demonize
Supervisord doesn't support demonize applications, thus we have to
make the uwsgi application to run not in background.
- Fixed Yardstick API path.
- Fixed HttpClient class to raise correct exception when
the HTML response (not JSON) like 4xx, 5xx is received.
(http://docs.python-requests.org/en/master/user/quickstart/#json-response-content)
JIRA: YARDSTICK-1297
Change-Id: I4d1c1bb7266eeed0bd357bd28b91206d1580611f
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 097bc3c3f..71ce6b584 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -51,6 +51,8 @@ EXPOSE 5000 5672 ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img ${IMAGE_DIR} ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img ${IMAGE_DIR} +# For developers: when `docker build ...` is running from YARDSTICK_REPO_DIR, please change +# path `./exec_tests.sh` -> `./docker/exec_tests.sh``. COPY ./exec_tests.sh /usr/local/bin/ ENV NSB_DIR="/opt/nsb_bin" diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index ef41cba03..472310f96 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -8,7 +8,7 @@ Signed-off-by: ting wu <ting.wu@enea.com> 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile -index 62ea0d0..f2f41771 100644 +index 71ce6b58..952d0f78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,9 @@ @@ -42,6 +42,5 @@ index 62ea0d0..f2f41771 100644 +ADD http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img ${IMAGE_DIR} +ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img ${IMAGE_DIR} - COPY ./exec_tests.sh /usr/local/bin/ - - + # For developers: when `docker build ...` is running from YARDSTICK_REPO_DIR, please change + # path `./exec_tests.sh` -> `./docker/exec_tests.sh``. |