From 179497ddcd0acba42352d8d7db7bb72e6cb03a15 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Fri, 7 Mar 2025 16:17:40 +1300 Subject: [PATCH] KASM-6904 CI: use masked Alpine signing key env var --- builder/dockerfile.alpine_319.apk.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/builder/dockerfile.alpine_319.apk.build b/builder/dockerfile.alpine_319.apk.build index 2d4dfdc..fcec8e3 100644 --- a/builder/dockerfile.alpine_319.apk.build +++ b/builder/dockerfile.alpine_319.apk.build @@ -9,8 +9,14 @@ WORKDIR $HOME/kasmvncserver ARG KASMVNC_ALPINE_PRIVATE_KEY ARG KASMVNC_ALPINE_PUBLIC_KEY ENV APK_KEYS_DIR=/etc/apk/keys -RUN echo -n "$KASMVNC_ALPINE_PRIVATE_KEY" > \ - $APK_KEYS_DIR/kasmvnc_signing_key.rsa +ENV BEGIN_PRIVATE_KEY='-----BEGIN PRIVATE KEY-----' +ENV END_PRIVATE_KEY='-----END PRIVATE 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 \ + echo "$BEGIN_PRIVATE_KEY\n$KASMVNC_ALPINE_PRIVATE_KEY\n$END_PRIVATE_KEY" > \ + $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