From 3aa41b6361cc4125ff1661a473ec0a4c1a356df2 Mon Sep 17 00:00:00 2001
From: orcas <daniel@makerforce.io>
Date: Fri, 28 Jun 2019 23:59:26 +0800
Subject: [PATCH] Integrated backend-transcription into revised bite pipeline

---
 backend-transcription |  2 +-
 backend-webrtc        |  2 +-
 docker-compose.yml    |  7 ++++---
 traefik.toml          | 16 ----------------
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/backend-transcription b/backend-transcription
index 680259c..9e8ae9b 160000
--- a/backend-transcription
+++ b/backend-transcription
@@ -1 +1 @@
-Subproject commit 680259c08740273830d40e7e1a74d3d3247353f4
+Subproject commit 9e8ae9b73ed1d3dda62022d2294a07017606863d
diff --git a/backend-webrtc b/backend-webrtc
index de78442..f7d9197 160000
--- a/backend-webrtc
+++ b/backend-webrtc
@@ -1 +1 @@
-Subproject commit de78442f6a71151094ea4d7fe4338c2cfe692858
+Subproject commit f7d9197940119f964d21583d8077c6fec0e1a0d3
diff --git a/docker-compose.yml b/docker-compose.yml
index b8d84bf..ffaa976 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,6 @@ services:
       - bite
       - publish
       - subscribe
-      - transcription
       - auth
       - pictures
       - webrtc
@@ -104,10 +103,14 @@ services:
     build: ./backend-webrtc
     tty: true
     restart: unless-stopped
+    depends_on:
+      - nats
     environment:
       - LISTEN=:80
+      - NATS=nats://nats:4222
     networks:
       - traefiknet
+      - natsnet
 
   login:
     build: ./backend-login
@@ -242,12 +245,10 @@ services:
     depends_on:
       - nats
     environment:
-      - LISTEN=:80
       - NATS=nats://nats:4222
       - API_KEY=AIzaSyDxSXDefzw9gXCQaVzOCYlRn_vcC9Da9Q0
     networks:
       - natsnet
-      - traefiknet
 
 networks:
   authnet:
diff --git a/traefik.toml b/traefik.toml
index 67ba62e..32642c1 100644
--- a/traefik.toml
+++ b/traefik.toml
@@ -131,22 +131,6 @@ entrypoints = ["http", "https"]
   [frontends.subscribe.routes.one]
   rule = "PathPrefixStrip: /subscribe/"
 
-# transcription
-[backends.transcription]
-  [backends.transcription.servers.one]
-  url = "http://transcription"
-
-[frontends.transcription]
-backend = "transcription"
-entrypoints = ["http", "https"]
-  [frontends.transcription.headers.customresponseheaders]
-  Access-Control-Allow-Origin = "*"
-  Access-Control-Allow-Headers = "Content-Type, Authorization, X-User-Claim"
-  Access-Control-Allow-Credentials = "true"
-  Access-Control-Allow-Methods = "GET, HEAD, POST, PUT, PATCH, DELETE"
-  [frontends.transcription.routes.one]
-  rule = "PathPrefixStrip: /transcription/"
-
 # pictures
 [backends.pictures]
   [backends.pictures.servers.one]