1
0
Kroese 1 жил өмнө
parent
commit
5a56b717c4
3 өөрчлөгдсөн 1 нэмэгдсэн , 9 устгасан
  1. 1 2
      Dockerfile
  2. 0 4
      src/entry.sh
  3. 0 3
      src/install.sh

+ 1 - 2
Dockerfile

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

+ 0 - 4
src/entry.sh

@@ -23,10 +23,6 @@ if [[ "${DISPLAY,,}" == "web" ]]; then
   nginx -e stderr
 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..."
 
 [[ "$DEBUG" == [Yy1]* ]] && set -x

+ 0 - 3
src/install.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 : "${EXTERNAL:="N"}"
 : "${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,,}" == "11" ]] && VERSION="win11x64"