feat: Move TPM emulator (#49)

This commit is contained in:
Kroese 2024-01-18 10:32:39 +01:00 committed by GitHub
parent 4a8f55ec58
commit 5a56b717c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 9 deletions

View File

@ -7,9 +7,8 @@ ARG DEBCONF_NONINTERACTIVE_SEEN "true"
RUN apt-get update \ RUN apt-get update \
&& apt-get --no-install-recommends -y install \ && apt-get --no-install-recommends -y install \
curl \ curl \
swtpm \ 7zip \
wimtools \ wimtools \
p7zip-full \
genisoimage \ genisoimage \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@ -23,10 +23,6 @@ if [[ "${DISPLAY,,}" == "web" ]]; then
nginx -e stderr nginx -e stderr
fi fi
mkdir -p /dev/shm/emulated_tpm
swtpm socket -t -d --tpmstate dir=/dev/shm/emulated_tpm --ctrl \
type=unixio,path=/dev/shm/emulated_tpm/swtpm-sock --log level=1 --tpm2
info "Booting Windows using $VERS..." info "Booting Windows using $VERS..."
[[ "$DEBUG" == [Yy1]* ]] && set -x [[ "$DEBUG" == [Yy1]* ]] && set -x

View File

@ -5,9 +5,6 @@ set -Eeuo pipefail
: "${EXTERNAL:="N"}" : "${EXTERNAL:="N"}"
: "${VERSION:="win11x64"}" : "${VERSION:="win11x64"}"
ARGUMENTS="-chardev socket,id=chrtpm,path=/dev/shm/emulated_tpm/swtpm-sock $ARGUMENTS"
ARGUMENTS="-tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0 $ARGUMENTS"
[[ "${VERSION,,}" == "http"* ]] && EXTERNAL="Y" [[ "${VERSION,,}" == "http"* ]] && EXTERNAL="Y"
[[ "${VERSION,,}" == "11" ]] && VERSION="win11x64" [[ "${VERSION,,}" == "11" ]] && VERSION="win11x64"