diff --git a/.gitmodules b/.gitmodules index 95fb845..e43a13a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "kasmweb"] path = kasmweb url = https://github.com/kasmtech/noVNC.git - branch = release/1.2.2 + branch = master diff --git a/builder/build_www.sh b/builder/build_www.sh index ec54f6c..b084dcf 100755 --- a/builder/build_www.sh +++ b/builder/build_www.sh @@ -1,18 +1,10 @@ -#!/bin/bash +#!/bin/sh # clear previous build rm -rf /build/* # build webpack npm run build -# remove node stuff from directory -rm -rf node_modules/ -# copy all to build dir -cp -R ./* /build/ -# remove unneccesary files -cd /build -rm *.md -rm AUTHORS -rm vnc.html -ln -s index.html vnc.html +# copy all to build dir +cp -R ./dist/* /build/ diff --git a/builder/dockerfile.www.build b/builder/dockerfile.www.build index be30b4b..e5a1845 100644 --- a/builder/dockerfile.www.build +++ b/builder/dockerfile.www.build @@ -1,6 +1,8 @@ -FROM node:12-buster +FROM alpine -COPY kasmweb/ /src/www/ +RUN apk add npm nodejs + +COPY kasmweb/ /src/www COPY builder/build_www.sh /src/ WORKDIR /src/www diff --git a/kasmweb b/kasmweb index bce2d6a..5c46b2e 160000 --- a/kasmweb +++ b/kasmweb @@ -1 +1 @@ -Subproject commit bce2d6a7048025c6e6c05df9d98b206c23f6dbab +Subproject commit 5c46b2e13ab1dd7232b28f017fd7e49ca740f5a4