From 7602a54309adbe5c5346ee6befecc2e596976504 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Tue, 11 Jul 2017 15:12:35 -0400 Subject: Change all paths Changes the paths of all source code so that it exists under the dockerfile location for each container. This way we can use COPY instead of git clone, as well as use the existing JJB. Change-Id: I883b2957d89659c164fff0a1ebc4d677c534796d JIRA: STORPERF-188 Signed-off-by: mbeierl --- docker/storperf-httpfrontend/html/index.html | 14 +++++++++ docker/storperf-httpfrontend/nginx.conf | 44 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 docker/storperf-httpfrontend/html/index.html create mode 100644 docker/storperf-httpfrontend/nginx.conf (limited to 'docker/storperf-httpfrontend') diff --git a/docker/storperf-httpfrontend/html/index.html b/docker/storperf-httpfrontend/html/index.html new file mode 100644 index 0000000..7c772a0 --- /dev/null +++ b/docker/storperf-httpfrontend/html/index.html @@ -0,0 +1,14 @@ + + + +StorPerf Home + + +

StorPerf

+ + + \ No newline at end of file diff --git a/docker/storperf-httpfrontend/nginx.conf b/docker/storperf-httpfrontend/nginx.conf new file mode 100644 index 0000000..d655aee --- /dev/null +++ b/docker/storperf-httpfrontend/nginx.conf @@ -0,0 +1,44 @@ +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; + + map $args $containsurl { + default 0; + "~(^|&)url=[^&]+($|&)" 1; + } + + server { + listen 5000; + + location /api/ { + proxy_pass http://storperf-master:5000; + proxy_set_header Host $host:$proxy_port; + } + + location /graphite/ { + proxy_pass http://storperf-master:8000; + proxy_set_header Host $host:$proxy_port; + } + + location /reporting/ { + proxy_pass http://storperf-reporting:5000/; + proxy_set_header Host $host:$proxy_port; + } + + location /swagger/ { + if ($containsurl = 0) { + return 302 $scheme://$host:$server_port$uri?url=http://$host:$server_port/api/spec.json$args; + } + proxy_pass http://storperf-swaggerui:80/; + } + } +} + +events { + worker_connections 1024; +} -- cgit 1.2.3-korg