publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix auth error and build permissions

Browse Source
This commit is contained in:
matt
2021-01-10 16:24:09 +00:00
parent 2b801e3397
commit de4ddcb154
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builder/build-deb
View File

@@ -4,8 +4,10 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
docker build -t debbuilder_ubuntu:18.04 -f \ sudo docker build -t debbuilder_ubuntu:18.04 -f \
builder/dockerfile.ubuntu1804.deb.build . builder/dockerfile.ubuntu1804.deb.build .
deb_output_dir=$(cd .. && echo $PWD) deb_output_dir=$(cd .. && echo $PWD)
docker run --rm -v "$deb_output_dir":/src debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker' L_UID=$(id -u) #Ubuntu already has UID env var, but this should work on all Linix systems
L_GID=$(id -g)
sudo docker run --rm -v "$deb_output_dir":/src --user $L_UID:$L_GID debbuilder_ubuntu:18.04 /bin/bash -c '/src/*/builder/build-deb-inside-docker'

11
builder/build-tarball
View File

@@ -4,7 +4,12 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
docker pull ubuntu:18.04 sudo docker pull ubuntu:18.04
docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build .
mkdir -p builder/build mkdir -p builder/build
docker run -v ${PWD}/builder/build:/build --rm kasmvncbuilder:18.04 sudo docker run -v /tmp:/build --rm kasmvncbuilder:18.04
L_GID=$(id -g)
L_UID=$(id -u)
sudo chown $L_UID:$L_GID /tmp/kasmvnc.ubuntu_18.04.tar.gz
mv /tmp/kasmvnc.ubuntu_18.04.tar.gz $PWD/builder/build/

2
builder/test-deb
View File

@@ -5,4 +5,4 @@ set -e
cd "$(dirname "$0")" cd "$(dirname "$0")"
docker build -t kasmvnctester-deb:18.04 -f dockerfile.ubuntu1804.deb.test . docker build -t kasmvnctester-deb:18.04 -f dockerfile.ubuntu1804.deb.test .
docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester-deb:18.04 #docker run -it -p 443:8443 --rm -e "VNC_USER=username" -e "VNC_PW=password123" kasmvnctester-deb:18.04

2
unix/vncserver
View File

@@ -276,7 +276,7 @@ $passwordArgSpecified = 0;
#} #}
# Disable vnc auth, kasmvnc uses https basic auth # Disable vnc auth, kasmvnc uses https basic auth
system("echo '' | ".$exedir."vncpasswd -f > $vncUserDir/passwd"); system("echo 'WrLNwLrcrxM=' | base64 -d > $vncUserDir/passwd");
$kasmAuthEnabled = 1; $kasmAuthEnabled = 1;