diff options
author | mbeierl <mark.beierl@dell.com> | 2017-07-11 15:12:35 -0400 |
---|---|---|
committer | mbeierl <mark.beierl@dell.com> | 2017-07-11 15:47:46 -0400 |
commit | 7602a54309adbe5c5346ee6befecc2e596976504 (patch) | |
tree | 60f15026780db30b0b8842ba1a1e2cc021e22625 /docker-compose/nginx.conf | |
parent | fc09b37e95c19f820ec60db19d98c0dc3d670829 (diff) |
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 <mark.beierl@dell.com>
Diffstat (limited to 'docker-compose/nginx.conf')
-rw-r--r-- | docker-compose/nginx.conf | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf deleted file mode 100644 index 6771358..0000000 --- a/docker-compose/nginx.conf +++ /dev/null @@ -1,39 +0,0 @@ -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:5000; - proxy_set_header Host $host:$proxy_port; - } - - location /graphite/ { - proxy_pass http://storperf:8000; - 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://swagger-ui:80/; - } - } -} - -events { - worker_connections 1024; -} |