preparing professor deployment

trunk
HeNine 3 years ago
parent 770a97387a
commit 46d228c42e

@ -6,6 +6,7 @@ bash fetch_models.sh
docker build -f buscribe/Dockerfile -t buscribe:$VERSION . docker build -f buscribe/Dockerfile -t buscribe:$VERSION .
docker build -f buscribe-api/Dockerfile -t buscribe-api:$VERSION . docker build -f buscribe-api/Dockerfile -t buscribe-api:$VERSION .
docker build -f professor-api/Dockerfile -t professor-api:$VERSION .
docker build -f docker-less/Dockerfile -t lessc . docker build -f docker-less/Dockerfile -t lessc .
docker run --rm -v "$(pwd)"/buscribe-web:/buscribe-web lessc /buscribe-web/style.less > buscribe-web/style.css docker run --rm -v "$(pwd)"/buscribe-web:/buscribe-web lessc /buscribe-web/style.less > buscribe-web/style.css

@ -50,8 +50,8 @@ http {
} }
location /buscribe/loadingreadyrun/json { proxy_pass http://buscribeapilrr:8010/buscribe/json; } location /buscribe/loadingreadyrun/json { proxy_pass http://buscribeapilrr:8010/buscribe/json; }
location /buscribe/desertbus/json { proxy_pass http://buscribeapidb:8010/buscribe/json; } location /buscribe/desertbus { proxy_pass http://buscribeapidb:8010/buscribe; }
location /professor/desertbus { proxy_pass http://professorapidb:8011/professor; }
} }
} }

@ -27,7 +27,7 @@ function pageReady() {
const bgOpacitySelector = document.querySelector('.vjs-bg-opacity > select'); const bgOpacitySelector = document.querySelector('.vjs-bg-opacity > select');
bgOpacitySelector.value = "0.5" bgOpacitySelector.value = "0.5"
fetch(`//localhost:8011/professor/line/${line_id}`) fetch(`/professor/desertbus/line/${line_id}`)
.then(response => response.json()) .then(response => response.json())
.then(fillLineInfo) .then(fillLineInfo)
.then(initializePlayer); .then(initializePlayer);
@ -84,11 +84,11 @@ function fillLineInfo(line_json) {
function initializePlayer() { function initializePlayer() {
videojs.getPlayer("player").src([ videojs.getPlayer("player").src([
{src: `//localhost:8011/professor/line/${line_id}/playlist.m3u8`} {src: `/professor/desertbus/line/${line_id}/playlist.m3u8`}
]); ]);
videojs.getPlayer("player").addRemoteTextTrack({ videojs.getPlayer("player").addRemoteTextTrack({
kind: "captions", kind: "captions",
src: `//localhost:8010/buscribe/vtt?start_time=${line.start_time}&end_time=${line.end_time}`, src: `/buscribe/desertbus/vtt?start_time=${line.start_time}&end_time=${line.end_time}`,
srclang: "en", srclang: "en",
label: "English", label: "English",
default: true default: true
@ -112,7 +112,7 @@ async function submit() {
} }
} }
return await fetch("//localhost:8011/professor/speaker", return await fetch("/professor/desertbus/speaker",
{ {
method: "PUT", method: "PUT",
headers: { headers: {
@ -126,7 +126,7 @@ async function submit() {
.pop(), 10)); .pop(), 10));
})); }));
fetch(`//localhost:8011/professor/line/${line_id}`, fetch(`/professor/desertbus/line/${line_id}`,
{ {
method: "POST", method: "POST",
headers: { headers: {
@ -144,7 +144,7 @@ async function submit() {
} }
$(function () { $(function () {
fetch("//localhost:8011/professor/speaker") fetch("/professor/desertbus/speaker")
.then(response => response.json()) .then(response => response.json())
.then(function (speakers_json) { .then(function (speakers_json) {
speakers = speakers_json; speakers = speakers_json;

Loading…
Cancel
Save