From 60ca0ad7f0bd468bf710a86120f002d95e13f3a3 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Wed, 1 Sep 2021 00:57:43 +1200 Subject: [PATCH] Deb: test-deb supports build tag Debian revision 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. --- builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test | 3 ++- builder/os_ver_cli.sh | 1 + builder/test-deb | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test index ff7377f..9f3236b 100644 --- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test +++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test @@ -45,7 +45,8 @@ ARG KASMVNC_PACKAGE_DIR COPY $KASMVNC_PACKAGE_DIR/libjpeg-turbo_*.deb /tmp 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 ### END CUSTOM STUFF ### diff --git a/builder/os_ver_cli.sh b/builder/os_ver_cli.sh index 846f085..9dc4f80 100644 --- a/builder/os_ver_cli.sh +++ b/builder/os_ver_cli.sh @@ -6,6 +6,7 @@ os_codename=${2:-$default_os_codename} build_tag="${3:-}" if [[ -n "$build_tag" ]]; then build_tag_for_images="_${build_tag#+}" + build_debian_revision="$(echo $build_tag | tr _ -)" fi os_image="$os:$os_codename" diff --git a/builder/test-deb b/builder/test-deb index 389c576..fa135d9 100755 --- a/builder/test-deb +++ b/builder/test-deb @@ -7,6 +7,7 @@ cd "$(dirname "$0")" tester_image=kasmvnctester_${os}:$os_codename${build_tag_for_images} docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \ + --build-arg BUILD_DEBIAN_REVISION="$build_debian_revision" \ -t "$tester_image" \ -f dockerfile.${os}_${os_codename}${build_tag}.deb.test . docker run -it -p 443:8443 --rm \