mirror of
https://github.com/kasmtech/KasmVNC.git
synced 2025-06-27 05:01:41 +02:00
KASM-6904 Refactor
This commit is contained in:
parent
1c279c2e94
commit
5edf55ee99
@ -11,23 +11,10 @@ WORKDIR $HOME/kasmvncserver
|
|||||||
ARG KASMVNC_ALPINE_PRIVATE_KEY
|
ARG KASMVNC_ALPINE_PRIVATE_KEY
|
||||||
ARG KASMVNC_ALPINE_PUBLIC_KEY
|
ARG KASMVNC_ALPINE_PUBLIC_KEY
|
||||||
ENV APK_KEYS_DIR=/etc/apk/keys
|
ENV APK_KEYS_DIR=/etc/apk/keys
|
||||||
ENV BEGIN_PRIVATE_KEY='-----BEGIN PRIVATE KEY-----'
|
|
||||||
ENV END_PRIVATE_KEY='-----END PRIVATE KEY-----'
|
ENV SCRIPTS_DIR=/tmp/scripts
|
||||||
ENV BEGIN_PUBLIC_KEY='-----BEGIN PUBLIC KEY-----'
|
COPY builder/scripts $SCRIPTS_DIR
|
||||||
ENV END_PUBLIC_KEY='-----END PUBLIC KEY-----'
|
RUN $SCRIPTS_DIR/install_alpine_signing_keys
|
||||||
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 -e "$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 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
|
RUN useradd -m docker && echo "docker:docker" | chpasswd
|
||||||
RUN echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
|
RUN echo 'docker ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
|
||||||
|
29
builder/scripts/install_alpine_signing_keys
Executable file
29
builder/scripts/install_alpine_signing_keys
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
install_private_signing_key() {
|
||||||
|
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 -e "$BEGIN_PRIVATE_KEY\n$KASMVNC_ALPINE_PRIVATE_KEY\n$END_PRIVATE_KEY" > \
|
||||||
|
$APK_KEYS_DIR/kasmvnc_signing_key.rsa
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install_public_signing_key() {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
BEGIN_PRIVATE_KEY='-----BEGIN PRIVATE KEY-----'
|
||||||
|
END_PRIVATE_KEY='-----END PRIVATE KEY-----'
|
||||||
|
BEGIN_PUBLIC_KEY='-----BEGIN PUBLIC KEY-----'
|
||||||
|
END_PUBLIC_KEY='-----END PUBLIC KEY-----'
|
||||||
|
|
||||||
|
install_private_signing_key
|
||||||
|
install_public_signing_key
|
Loading…
x
Reference in New Issue
Block a user