From fe28be2dc01db621be24258001fd8c39560ad933 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Mon, 10 Mar 2025 18:12:08 +1300 Subject: [PATCH] KASM-6904 Add arch to Alpine packages --- .ci/detect_os_arch_package_format | 2 ++ builder/build-apk-inside-docker | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/.ci/detect_os_arch_package_format b/.ci/detect_os_arch_package_format index dc76376..adf4a56 100755 --- a/.ci/detect_os_arch_package_format +++ b/.ci/detect_os_arch_package_format @@ -4,8 +4,10 @@ package_name = ARGV.first DEB_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver_.+?_(?.+?).(?deb)! RPM_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver-.+?\.(?[^.]+).(?rpm)! +ALPINE_PACKAGE_REGEX = %r!(?[^/]+)/kasmvncserver-.+?-r\d+_(?[^.]+)\.(?apk)! if matches = package_name.match(DEB_PACKAGE_REGEX) +elsif matches = package_name.match(ALPINE_PACKAGE_REGEX) else matches = package_name.match(RPM_PACKAGE_REGEX) end diff --git a/builder/build-apk-inside-docker b/builder/build-apk-inside-docker index e221814..75322e3 100755 --- a/builder/build-apk-inside-docker +++ b/builder/build-apk-inside-docker @@ -2,6 +2,12 @@ set -e +add_arch_to_apk_package() { + package_name=$(ls *.apk | grep -v kasmvncserver-doc) + new_package_name=$(echo "$package_name" | sed -e 's/\(-r[[:digit:]]\+\)/\1_'$(arch)/) + $sudo_cmd mv "$package_name" "$new_package_name" +} + os=alpine os_codename=$(cat /etc/os-release | awk '/VERSION_ID/' | grep -o '[[:digit:]]' | tr -d '\n' | head -c 3) apkbuild_dir=/src/alpine/kasmvncserver/ @@ -10,5 +16,6 @@ cd "$apkbuild_dir" && abuild -r [ -n "$CI" ] && sudo_cmd=sudo || sudo_cmd= $sudo_cmd mkdir -p /src/builder/build/${os}_${os_codename} +( cd /src/alpine/packages/alpine/$(arch)/ && add_arch_to_apk_package ) $sudo_cmd mv \ /src/alpine/packages/alpine/$(arch)/*.apk /src/builder/build/${os}_${os_codename}/