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

Deb: test-deb supports build tag Debian revision

Browse Source 
Packages build with a build tag as `build-deb ubuntu bionic +tag` will
have "+tag" in Debian package name as Debian revision. test-deb now will
use the package with the tag for testing purposes.
This commit is contained in:
Dmitry Maksyoma
2021-09-01 00:57:43 +12:00
parent 45e6bd201d
commit 60ca0ad7f0
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test
View File

@@ -45,7 +45,8 @@ ARG KASMVNC_PACKAGE_DIR
COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_*.deb /tmp COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_*.deb /tmp
RUN apt-get install /tmp/libjpeg-turbo*deb RUN apt-get install /tmp/libjpeg-turbo*deb
COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp ARG BUILD_DEBIAN_REVISION
COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*$BUILD_DEBIAN_REVISION*.deb /tmp
RUN dpkg -i /tmp/*.deb; apt-get -yf install RUN dpkg -i /tmp/*.deb; apt-get -yf install
### END CUSTOM STUFF ### ### END CUSTOM STUFF ###

1
builder/os_ver_cli.sh
View File

@@ -6,6 +6,7 @@ os_codename=${2:-$default_os_codename}
build_tag="${3:-}" build_tag="${3:-}"
if [[ -n "$build_tag" ]]; then if [[ -n "$build_tag" ]]; then
build_tag_for_images="_${build_tag#+}" build_tag_for_images="_${build_tag#+}"
build_debian_revision="$(echo $build_tag | tr _ -)"
fi fi
os_image="$os:$os_codename" os_image="$os:$os_codename"

1
builder/test-deb
View File

@@ -7,6 +7,7 @@ cd "$(dirname "$0")"
tester_image=kasmvnctester_${os}:$os_codename${build_tag_for_images} tester_image=kasmvnctester_${os}:$os_codename${build_tag_for_images}
docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \ docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
--build-arg BUILD_DEBIAN_REVISION="$build_debian_revision" \
-t "$tester_image" \ -t "$tester_image" \
-f dockerfile.${os}_${os_codename}${build_tag}.deb.test . -f dockerfile.${os}_${os_codename}${build_tag}.deb.test .
docker run -it -p 443:8443 --rm \ docker run -it -p 443:8443 --rm \