From 955183dcf06c2b070511175f4e1e8b1c98ec7faa Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 14 Jan 2021 19:04:43 +1300 Subject: [PATCH] Use/build ./builder/www when building tarball --- builder/build-tarball | 7 +++++++ release/maketarball.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/builder/build-tarball b/builder/build-tarball index d0ee4e5..baa3188 100755 --- a/builder/build-tarball +++ b/builder/build-tarball @@ -2,8 +2,15 @@ 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")/.." +build_www_dir + sudo docker pull ubuntu:18.04 sudo docker build -t kasmvncbuilder:18.04 -f builder/dockerfile.ubuntu1804.build . mkdir -p builder/build diff --git a/release/maketarball.in b/release/maketarball.in index 145ce84..02888f7 100644 --- a/release/maketarball.in +++ b/release/maketarball.in @@ -51,7 +51,7 @@ if [ $SERVER = 1 ]; then mkdir -p $OUTDIR/lib/dri/ install -m 755 ./xorg.build/lib/dri/swrast_dri.so $OUTDIR/lib/dri/ mkdir -p $OUTDIR/share/kasmvnc - cp -r $SRCDIR/kasmweb $OUTDIR/share/kasmvnc/www + cp -r $SRCDIR/builder/www $OUTDIR/share/kasmvnc/www fi #pushd $TMPDIR/inst