From 562b3832c8e7d68232c286d60fbf76904d37c035 Mon Sep 17 00:00:00 2001
From: h-otter <h-otter@outlook.jp>
Date: Wed, 1 May 2019 00:55:04 +0900
Subject: [PATCH] use delete nginx container

---
 build/nginx/default.conf | 19 -------------------
 docker-compose.yml       | 24 +++++++++---------------
 n0bff/main.go            | 10 ++++++++--
 3 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 build/nginx/default.conf

diff --git a/build/nginx/default.conf b/build/nginx/default.conf
deleted file mode 100644
index 4a8f2484..00000000
--- a/build/nginx/default.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-server {
-    listen       8080;
-    server_name  localhost;
-    # index             index.html index.htm;
-
-    location = /swagger/n0stack.swagger.json {
-        root    /usr/share/nginx/html;
-        expires -1;
-    }
-
-    location /swagger {
-        proxy_pass  http://swagger:8080/;
-    }
-
-    location / {
-        proxy_pass  http://bff:8080;
-    }
-}
-
diff --git a/docker-compose.yml b/docker-compose.yml
index a6161fa3..88165767 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,14 @@ services:
       - "8080:8080"
       - "20180:20180"
 
+  swagger:
+    image: swaggerapi/swagger-ui
+    volumes:
+      - ./n0proto.swagger.json/n0stack.swagger.json:/usr/share/nginx/html/n0stack.swagger.json
+    environment:
+      API_URL: n0stack.swagger.json
+      # BASE_URL: swagger
+
   bff:
     image: debian:buster
     volumes:
@@ -21,22 +29,8 @@ services:
       - /n0stack/n0bff
       - serve
       - bff
-    links:
-      - api
-
-  swagger:
-    image: swaggerapi/swagger-ui
-    environment:
-      API_URL: n0stack.swagger.json
-      # BASE_URL: swagger
-
-  nginx:
-    image: nginx
-    volumes:
-      - ./build/nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - ./n0proto.swagger.json/n0stack.swagger.json:/usr/share/nginx/html/swagger/n0stack.swagger.json
     ports:
       - "8000:8080"
     links:
-      - bff
+      - api
       - swagger
diff --git a/n0bff/main.go b/n0bff/main.go
index e42f3923..99bc0075 100644
--- a/n0bff/main.go
+++ b/n0bff/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"os"
@@ -91,17 +92,22 @@ func ServeBFF(c *cli.Context) error {
 		return err
 	}
 
-	u := &url.URL{
+	n0core := &url.URL{
 		Scheme: "http",
 		Host:   "api:8080",
 	}
+	swagger := &url.URL{
+		Scheme: "http",
+		Host:   "swagger:8080",
+	}
 	// /n0core にプロキシ
 	e := echo.New()
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
 	e.GET("/api/*", echo.WrapHandler(mux))
 	// websocket proxy ができてない
-	e.GET("/n0core/*", echo.WrapHandler(httputil.NewSingleHostReverseProxy(u)))
+	e.GET("/n0core/*", echo.WrapHandler(httputil.NewSingleHostReverseProxy(n0core)))
+	e.GET("/swagger/*", echo.WrapHandler(http.StripPrefix("/swagger", httputil.NewSingleHostReverseProxy(swagger))))
 
 	log.Printf("[INFO] Started BFF: version=%s", version)
 	return e.Start("0.0.0.0:8080")