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