Browse Source

build: Remove Python from image (#45)

Kroese 1 year ago
parent
commit
447c9cf53d
2 changed files with 4 additions and 5 deletions
  1. 1 2
      Dockerfile
  2. 3 3
      src/entry.sh

+ 1 - 2
Dockerfile

@@ -7,7 +7,6 @@ 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 \
-        novnc \
         swtpm \
         swtpm \
         wimtools \
         wimtools \
         p7zip-full \
         p7zip-full \
@@ -23,7 +22,7 @@ ADD https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virt
 
 
 RUN chmod +x /run/*.sh
 RUN chmod +x /run/*.sh
 
 
-EXPOSE 3389 8006
+EXPOSE 8006 3389
 VOLUME /storage
 VOLUME /storage
 
 
 ENV RAM_SIZE "4G"
 ENV RAM_SIZE "4G"

+ 3 - 3
src/entry.sh

@@ -4,7 +4,6 @@ set -Eeuo pipefail
 echo "❯ Starting Windows for Docker v$(</run/version)..."
 echo "❯ Starting Windows for Docker v$(</run/version)..."
 echo "❯ For support visit https://github.com/dockur/windows"
 echo "❯ For support visit https://github.com/dockur/windows"
 
 
-export DISPLAY=web
 export BOOT_MODE=windows
 export BOOT_MODE=windows
 
 
 cd /run
 cd /run
@@ -20,8 +19,9 @@ cd /run
 
 
 trap - ERR
 trap - ERR
 
 
-ln -sfn /usr/share/novnc/vnc_lite.html /usr/share/novnc/index.html
-websockify -D --web /usr/share/novnc/ 8006 localhost:5900 2>/dev/null
+if [[ "${DISPLAY,,}" == "web" ]]; then
+  nginx -e stderr
+fi
 
 
 mkdir -p /dev/shm/emulated_tpm
 mkdir -p /dev/shm/emulated_tpm
 swtpm socket -t -d --tpmstate dir=/dev/shm/emulated_tpm --ctrl \
 swtpm socket -t -d --tpmstate dir=/dev/shm/emulated_tpm --ctrl \