From 232e97a8926567965db6ca5e8bc9aa79afa7dea6 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Thu, 27 Feb 2025 22:35:56 +1300 Subject: [PATCH] KASM-6904 Alpine: update 3.21 pipeline to build apk --- alpine/kasmvncserver/APKBUILD | 3 ++- builder/build-apk | 2 ++ builder/build-apk-inside-docker | 6 ++++-- builder/dockerfile.alpine_321.apk.build | 6 ++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/alpine/kasmvncserver/APKBUILD b/alpine/kasmvncserver/APKBUILD index bf74e65..46135e4 100644 --- a/alpine/kasmvncserver/APKBUILD +++ b/alpine/kasmvncserver/APKBUILD @@ -56,7 +56,8 @@ builddir="$srcdir/" build() { - tar -xzf ../kasmvnc.alpine_321_x86_64.tgz -C "$srcdir"; + local alpine_version=$(cat /etc/alpine-release | awk -F. '{ print $1$2 }') + tar -xzf "/src/builder/build/kasmvnc.alpine_$alpine_version.tar.gz" -C "$srcdir"; } check() { diff --git a/builder/build-apk b/builder/build-apk index 73fa677..b790d57 100755 --- a/builder/build-apk +++ b/builder/build-apk @@ -12,6 +12,8 @@ docker build -t kasmvnc_apkbuilder_${os}:${os_codename} -f \ source_dir=$(echo $PWD) L_UID=$(id -u) L_GID=$(id -g) +ABUILD_GID=300 docker run --rm -v "$source_dir":/src --user $L_UID:$L_GID \ + --group-add $ABUILD_GID \ kasmvnc_apkbuilder_${os}:${os_codename} /bin/bash -c \ '/src/builder/build-apk-inside-docker' diff --git a/builder/build-apk-inside-docker b/builder/build-apk-inside-docker index 08617f7..ad7acc6 100755 --- a/builder/build-apk-inside-docker +++ b/builder/build-apk-inside-docker @@ -4,8 +4,10 @@ set -e 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/ + +cd "$apkbuild_dir" && abuild -r mkdir -p /src/builder/build/${os}_${os_codename} mv \ - /src/builder/build/kasmvnc.${os}_${os_codename}.tar.gz \ - /src/builder/build/${os}_${os_codename}/kasmvnc.${os}_${os_codename}_$(uname -m).tgz + /src/alpine/packages/alpine/x86_64/*.apk /src/builder/build/${os}_${os_codename}/ diff --git a/builder/dockerfile.alpine_321.apk.build b/builder/dockerfile.alpine_321.apk.build index b67ef79..a6c5867 100644 --- a/builder/dockerfile.alpine_321.apk.build +++ b/builder/dockerfile.alpine_321.apk.build @@ -1,6 +1,12 @@ FROM alpine:3.21 RUN apk add shadow bash +RUN apk add abuild sudo less + +ENV HOME /src/alpine +WORKDIR $HOME/kasmvncserver + +COPY alpine/.abuild/*.pub /etc/apk/keys/ RUN useradd -m docker && echo "docker:docker" | chpasswd