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

Use/build ./builder/www when building tarball

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-01-14 19:04:43 +13:00
parent d98157f3fc
commit 955183dcf0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builder/build-tarball
View File

@@ -2,8 +2,15 @@
set -e set -e
build_www_dir() {
sudo docker build -t kasmweb/www -f builder/dockerfile.www.build .
sudo docker run -it --rm -v $PWD/builder/www:/build kasmweb/www:latest
}
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
build_www_dir
sudo docker pull ubuntu:18.04 sudo docker pull ubuntu:18.04
sudo 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

2
release/maketarball.in
View File

@@ -51,7 +51,7 @@ if [ $SERVER = 1 ]; then
mkdir -p $OUTDIR/lib/dri/ mkdir -p $OUTDIR/lib/dri/
install -m 755 ./xorg.build/lib/dri/swrast_dri.so $OUTDIR/lib/dri/ install -m 755 ./xorg.build/lib/dri/swrast_dri.so $OUTDIR/lib/dri/
mkdir -p $OUTDIR/share/kasmvnc mkdir -p $OUTDIR/share/kasmvnc
cp -r $SRCDIR/kasmweb $OUTDIR/share/kasmvnc/www cp -r $SRCDIR/builder/www $OUTDIR/share/kasmvnc/www
fi fi
#pushd $TMPDIR/inst #pushd $TMPDIR/inst