Prepare the repository for having a separate calculator app.
This commit is contained in:
parent
d44ae5501f
commit
ffa2e53994
8 changed files with 14 additions and 2 deletions
|
|
@ -2,8 +2,6 @@ version: "3.8"
|
|||
services:
|
||||
cara-app:
|
||||
image: cara-voila-app
|
||||
# ports:
|
||||
# - "8080:8081"
|
||||
links:
|
||||
- cara-router
|
||||
cara-router:
|
||||
|
|
|
|||
1
app-config/nginx/404.html
Normal file
1
app-config/nginx/404.html
Normal file
|
|
@ -0,0 +1 @@
|
|||
Page not found!
|
||||
1
app-config/nginx/calculator-static
Symbolic link
1
app-config/nginx/calculator-static
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../../cara/apps/calculator/static
|
||||
|
|
@ -46,6 +46,8 @@ http {
|
|||
}
|
||||
|
||||
location /voila-server/ {
|
||||
# cara-app is the name of the voila server in each of docker-compose,
|
||||
# test-cara.web.cern.ch and cara.web.cern.ch.
|
||||
proxy_pass http://cara-app:8080/voila-server/;
|
||||
|
||||
proxy_set_header Host $host;
|
||||
|
|
@ -58,6 +60,12 @@ http {
|
|||
proxy_read_timeout 86400;
|
||||
}
|
||||
rewrite ^/expert-app$ /voila-server/voila/render/cara.ipynb last;
|
||||
|
||||
# Give the static content of the calculator app a sensible name which is
|
||||
# consistent with the static directory of the calculator webserver used
|
||||
# for development.
|
||||
rewrite ^/calculator/static/(.*)$ /calculator-static/$1 last;
|
||||
|
||||
# Before implementing the nginx router we could access /voila/render/cara.ipynb.
|
||||
# Redirect this (and all other) URLs to the new scheme.
|
||||
rewrite ^/voila/(.*)$ /voila-server/voila/$1 redirect;
|
||||
|
|
|
|||
4
cara/apps/__init__.py
Normal file
4
cara/apps/__init__.py
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
from .expert import ExpertApplication
|
||||
|
||||
|
||||
__all__ = ['ExpertApplication']
|
||||
0
cara/apps/calculator/__init__.py
Normal file
0
cara/apps/calculator/__init__.py
Normal file
0
cara/apps/calculator/static/form.html
Normal file
0
cara/apps/calculator/static/form.html
Normal file
Loading…
Reference in a new issue