From 950d358af9891637269a89e1a7b53505c492b4fd Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Sun, 9 Mar 2025 16:08:19 +1300 Subject: [PATCH] KASM-6904 Fix CI --- builder/dockerfile.alpine_319.apk.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/builder/dockerfile.alpine_319.apk.build b/builder/dockerfile.alpine_319.apk.build index 699ddbd..2c60fef 100644 --- a/builder/dockerfile.alpine_319.apk.build +++ b/builder/dockerfile.alpine_319.apk.build @@ -13,6 +13,8 @@ ARG KASMVNC_ALPINE_PUBLIC_KEY ENV APK_KEYS_DIR=/etc/apk/keys ENV BEGIN_PRIVATE_KEY='-----BEGIN PRIVATE KEY-----' ENV END_PRIVATE_KEY='-----END PRIVATE KEY-----' +ENV BEGIN_PUBLIC_KEY='-----BEGIN PUBLIC KEY-----' +ENV END_PUBLIC_KEY='-----END PUBLIC KEY-----' RUN if echo "$KASMVNC_ALPINE_PRIVATE_KEY" | grep -q -- "$BEGIN_PRIVATE_KEY"; then \ echo "$KASMVNC_ALPINE_PRIVATE_KEY" > $APK_KEYS_DIR/kasmvnc_signing_key.rsa; \ else \ @@ -20,10 +22,12 @@ RUN if echo "$KASMVNC_ALPINE_PRIVATE_KEY" | grep -q -- "$BEGIN_PRIVATE_KEY"; the $APK_KEYS_DIR/kasmvnc_signing_key.rsa; \ fi RUN echo KASMVNC_ALPINE_PRIVATE_KEY "$KASMVNC_ALPINE_PRIVATE_KEY" -RUN echo -n "$KASMVNC_ALPINE_PUBLIC_KEY" > \ - $APK_KEYS_DIR/kasmvnc_signing_key.rsa.pub -RUN echo KASMVNC_ALPINE_PUBLIC_KEY "$KASMVNC_ALPINE_PUBLIC_KEY" -RUN env +RUN if echo "$KASMVNC_ALPINE_PUBLIC_KEY" | grep -q -- "$BEGIN_PUBLIC_KEY"; then \ + echo "$KASMVNC_ALPINE_PUBLIC_KEY" > $APK_KEYS_DIR/kasmvnc_signing_key.rsa.pub; \ + else \ + echo -e "$BEGIN_PUBLIC_KEY\n$KASMVNC_ALPINE_PUBLIC_KEY\n$END_PUBLIC_KEY" > \ + $APK_KEYS_DIR/kasmvnc_signing_key.rsa.pub; \ + fi RUN useradd -m docker && echo "docker:docker" | chpasswd