1
0
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop synced 2026-08-05 16:12:41 +02:00

Add ENV variable PREFIX_PATH to backend and web project

This commit is contained in:
Tobias Stein
2019-06-26 11:56:29 +02:00
parent f26fe29012
commit 175d7a8517
10 changed files with 49 additions and 25 deletions
+10 -2
View File
@@ -13,11 +13,19 @@ server {
root /usr/local/lib/web/frontend/;
index index.html index.htm;
location ~ ^/APP/api {
location = /app {
try_files $uri @rewrites;
}
location @rewrites {
rewrite ^(.+)$ /index.html last;
}
location ~ ^/app/api {
try_files $uri @api;
}
location = /APP/websockify {
location = /app/websockify {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
+8 -4
View File
@@ -7,6 +7,10 @@ directory=/root
[program:nginx]
priority=10
command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;'
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
stderr_logfile=/dev/fd/1
stderr_logfile_maxbytes=0
[program:web]
priority=10
@@ -41,8 +45,6 @@ user=%USER%
environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"
[program:xvfb]
priority=10
command=/usr/local/bin/xvfb.sh
@@ -52,8 +54,10 @@ stopsignal=KILL
priority=20
command=x11vnc -display :1 -xkb -forever -shared -repeat
[program:novnc]
priority=25
directory=/usr/local/lib/web/frontend/static/novnc
command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6081
directory=/usr/local/lib/web/frontend%(ENV_PREFIX_PATH)s/static/novnc
command=bash /usr/local/lib/web/frontend%(ENV_PREFIX_PATH)s/static/novnc/utils/launch.sh --listen 6081
stopasgroup=true
+2 -2
View File
@@ -60,8 +60,8 @@ if [ -n "$HTTP_PASSWORD" ]; then
fi
# novnc websockify
ln -s /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/frontend/static/novnc/utils/websockify
chmod +x /usr/local/lib/web/frontend/static/websockify/run
ln -s "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify" "/usr/local/lib/web/frontend$PREFIX_PATH/static/novnc/utils/websockify"
chmod +x "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify/run"
# clearup
PASSWORD=
+10 -6
View File
@@ -2,13 +2,14 @@ from __future__ import (
absolute_import, division, print_function, with_statement
)
import re
from os import environ
import os
from flask import (
Flask,
request,
Response,
jsonify,
abort,
url_for,
)
from gevent import subprocess as gsp, spawn, sleep
from geventwebsocket.exceptions import WebSocketError
@@ -21,12 +22,14 @@ from .log import log
# Flask app
app = Flask('novnc2')
app.config.from_object('config.Default')
app.config.from_object(environ.get('CONFIG') or 'config.Development')
app.config.from_object(os.environ.get('CONFIG') or 'config.Development')
PREFIX = os.getenv("PREFIX_PATH")
@app.route('/api/state')
@app.route(PREFIX+'/api/state')
@httperror
def apistate():
print(url_for("apistate"))
state.wait(int(request.args.get('id', -1)), 30)
state.switch_video(request.args.get('video', 'false') == 'true')
mystate = state.to_dict()
@@ -36,14 +39,15 @@ def apistate():
})
@app.route('/api/health')
@app.route(PREFIX+'/api/health')
def apihealth():
print(url_for("apihealth"))
if state.health:
return 'success'
abort(503, 'unhealthy')
@app.route('/api/reset')
@app.route(PREFIX+'/api/reset')
def reset():
if 'w' in request.args and 'h' in request.args:
args = {
@@ -68,7 +72,7 @@ def reset():
return jsonify({'code': 200})
@app.route('/api/live.flv')
@app.route(PREFIX+'/api/live.flv')
@httperror
def liveflv():
def generate():