diff options
Diffstat (limited to 'docker-compose')
| -rw-r--r-- | docker-compose/docker-compose.yaml | 29 | ||||
| -rw-r--r-- | docker-compose/nginx.conf | 39 |
2 files changed, 17 insertions, 51 deletions
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index dbba825..7747506 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -1,25 +1,30 @@ version: '2' services: - storperf: - container_name: "storperf" - image: "opnfv/storperf:${TAG}" + storperf-master: + container_name: "storperf-master" + image: "opnfv/storperf-master:${TAG}" ports: - "8000:8000" env_file: ${ENV_FILE} volumes: - ${CARBON_DIR}:/opt/graphite/storage/whisper - swagger-ui: - container_name: "swagger-ui" + storperf-reporting: + container_name: "storperf-reporting" + image: "opnfv/storperf-reporting:${TAG}" + ports: + - "5080:5000" + + storperf-swaggerui: + container_name: "storperf-swaggerui" image: "schickling/swagger-ui" - http-front-end: - container_name: "http-front-end" - image: nginx:stable-alpine + storperf-httpfrontend: + container_name: "storperf-httpfrontend" + image: "opnfv/storperf-httpfrontend:${TAG}" ports: - "5000:5000" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro links: - - storperf - - swagger-ui
\ No newline at end of file + - storperf-master + - storperf-reporting + - storperf-swaggerui
\ No newline at end of file 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; -} |