fix: Disable kernel networking in bridge mode (#257)

.github/workflows/build.yml

@@ -92,6 +92,13 @@ jobs:
         uses: action-pack/bump@v2
         with:
           token: ${{ secrets.REPO_ACCESS_TOKEN }}
+      -
+        name: Push to Gitlab mirror
+        uses: action-pack/gitlab-sync@v3
+        with:
+          url: ${{ secrets.GITLAB_URL }}
+          token: ${{ secrets.GITLAB_TOKEN }}
+          username: ${{ secrets.GITLAB_USERNAME }}
       -
         name: Send mail
         uses: action-pack/send-mail@v1

Dockerfile

@@ -1,7 +1,7 @@
 FROM scratch
-COPY --from=qemux/qemu-docker:4.15 / /
+COPY --from=qemux/qemu-docker:4.17 / /
 
-ARG DEBCONF_NOWARNINGS="yes"
+ARG DEBCONF_NOWARNINGS "yes"
 ARG DEBIAN_FRONTEND "noninteractive"
 ARG DEBCONF_NONINTERACTIVE_SEEN "true"
 

readme.md

@@ -96,7 +96,7 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
 
 * ### How do I connect using RDP?
 
-  The web-viewer is mainly ment to be used during installation, as its picture quality is low, and it has no audio or clipboard for example.
+  The web-viewer is mainly meant to be used during installation, as its picture quality is low, and it has no audio or clipboard for example.
 
   So for a better experience you can connect using any Microsoft Remote Desktop client to the IP of the container, using the username `docker` and by leaving the password empty.
 
@@ -227,6 +227,8 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
   ```yaml
   environment:
     DHCP: "Y"
+  devices:
+    - /dev/vhost-net
   device_cgroup_rules:
     - 'c *:* rwm'
   ```

src/entry.sh

@@ -23,6 +23,10 @@ trap - ERR
 info "Booting $APP using $VERS..."
 [[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
 
+if [[ "$CONSOLE" == [Yy]* ]]; then
+  exec qemu-system-x86_64 ${ARGS:+ $ARGS}
+fi
+
 { qemu-system-x86_64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
 (( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15
 
@@ -31,4 +35,5 @@ tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
 wait $! || :
 
-sleep 1 && finish 0
+sleep 1 & wait $!
+finish 0

src/samba.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+: "${SAMBA:="Y"}"
+
 [[ "$DHCP" == [Yy1]* ]] && return 0
+[[ "$SAMBA" != [Yy1]* ]] && return 0
+[[ "$NETWORK" != [Yy1]* ]] && return 0
 
 SHARE="$STORAGE/shared"