diff --git a/server/vm/docker.ts b/server/vm/docker.ts index 29990deaaf..787299e7df 100644 --- a/server/vm/docker.ts +++ b/server/vm/docker.ts @@ -32,9 +32,7 @@ export class Docker extends VMManager { INDEX=$(($PORT - 5000)) UDP_START=$((59000+$INDEX*100)) UDP_END=$((59099+$INDEX*100)) - docker run -d --rm --name=${name} --memory="2g" --cpus="2" -p $PORT:$PORT -p $UDP_START-$UDP_END:$UDP_START-$UDP_END/udp -v /etc/letsencrypt:/etc/letsencrypt -l ${this.getTag()} -l index=$INDEX --log-opt max-size=1g --shm-size=1g --cap-add="SYS_ADMIN" -e NEKO_KEY="/etc/letsencrypt/live/${gatewayHost}/privkey.pem" -e NEKO_CERT="/etc/letsencrypt/live/${gatewayHost}/fullchain.pem" -e DISPLAY=":99.0" -e NEKO_SCREEN="${ - this.isLarge ? '1920x1080@30' : '' - }" -e NEKO_PASSWORD=${name} -e NEKO_PASSWORD_ADMIN=${name} -e NEKO_BIND=":$PORT" -e NEKO_EPR=":$UDP_START-$UDP_END" -e NEKO_H264="1" ${imageName} + docker run -d --rm --name=${name} --memory="2g" --cpus="2" -p $PORT:$PORT -p $UDP_START-$UDP_END:$UDP_START-$UDP_END/udp -v /etc/letsencrypt:/etc/letsencrypt -l ${this.getTag()} -l index=$INDEX --log-opt max-size=1g --shm-size=1g --cap-add="SYS_ADMIN" -e NEKO_KEY="/etc/letsencrypt/live/${gatewayHost}/privkey.pem" -e NEKO_CERT="/etc/letsencrypt/live/${gatewayHost}/fullchain.pem" -e DISPLAY=":99.0" -e NEKO_PASSWORD=${name} -e NEKO_PASSWORD_ADMIN=${name} -e NEKO_BIND=":$PORT" -e NEKO_EPR=":$UDP_START-$UDP_END" -e NEKO_H264="1" ${imageName} `, sshConfig, (err: string, stdout: string) => { diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx index ed9e8e175f..2ff3fb7f09 100644 --- a/src/components/App/App.tsx +++ b/src/components/App/App.tsx @@ -419,9 +419,7 @@ export default class App extends React.Component { loading: Boolean(data.video), nonPlayableMedia: false, isVBrowserLarge: data.isVBrowserLarge, - vBrowserResolution: data.isVBrowserLarge - ? '1920x1080@30' - : '1280x720@30', + vBrowserResolution: '1280x720@30', controller: data.controller, isLiveHls: false, }, @@ -795,7 +793,7 @@ export default class App extends React.Component { this.setState({ settings }); }; - loadSignInData = async (user: firebase.User | null) => { + loadSignInData = async (user: firebase.User | undefined) => { if (user && this.socket) { // NOTE: firebase auth doesn't provide the actual first name data that individual providers (G/FB) do // It's accessible at the time the user logs in but not afterward