fix: Disable kernel networking in bridge mode (#39)
This commit is contained in:
parent
9909f95f27
commit
e29ef11c96
5 changed files with 21 additions and 3 deletions
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
|
@ -92,6 +92,13 @@ jobs:
|
||||||
uses: action-pack/bump@v2
|
uses: action-pack/bump@v2
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
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
|
name: Send mail
|
||||||
uses: action-pack/send-mail@v1
|
uses: action-pack/send-mail@v1
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM scratch
|
FROM scratch
|
||||||
COPY --from=qemux/qemu-arm:1.05 / /
|
COPY --from=qemux/qemu-arm:1.06 / /
|
||||||
|
|
||||||
ARG DEBCONF_NOWARNINGS="yes"
|
ARG DEBCONF_NOWARNINGS "yes"
|
||||||
ARG DEBIAN_FRONTEND "noninteractive"
|
ARG DEBIAN_FRONTEND "noninteractive"
|
||||||
ARG DEBCONF_NONINTERACTIVE_SEEN "true"
|
ARG DEBCONF_NONINTERACTIVE_SEEN "true"
|
||||||
|
|
||||||
|
|
|
@ -183,6 +183,8 @@ docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --cap-add NET_
|
||||||
```yaml
|
```yaml
|
||||||
environment:
|
environment:
|
||||||
DHCP: "Y"
|
DHCP: "Y"
|
||||||
|
devices:
|
||||||
|
- /dev/vhost-net
|
||||||
device_cgroup_rules:
|
device_cgroup_rules:
|
||||||
- 'c *:* rwm'
|
- 'c *:* rwm'
|
||||||
```
|
```
|
||||||
|
|
|
@ -23,6 +23,10 @@ trap - ERR
|
||||||
info "Booting $APP using $VERS..."
|
info "Booting $APP using $VERS..."
|
||||||
[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
|
[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
|
||||||
|
|
||||||
|
if [[ "$CONSOLE" == [Yy]* ]]; then
|
||||||
|
exec qemu-system-x86_64 ${ARGS:+ $ARGS}
|
||||||
|
fi
|
||||||
|
|
||||||
{ qemu-system-aarch64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
|
{ qemu-system-aarch64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
|
||||||
(( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15
|
(( 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" &
|
cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
|
||||||
wait $! || :
|
wait $! || :
|
||||||
|
|
||||||
sleep 1 && finish 0
|
sleep 1 & wait $!
|
||||||
|
finish 0
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
: "${SAMBA:="Y"}"
|
||||||
|
|
||||||
[[ "$DHCP" == [Yy1]* ]] && return 0
|
[[ "$DHCP" == [Yy1]* ]] && return 0
|
||||||
|
[[ "$SAMBA" != [Yy1]* ]] && return 0
|
||||||
|
[[ "$NETWORK" != [Yy1]* ]] && return 0
|
||||||
|
|
||||||
SHARE="$STORAGE/shared"
|
SHARE="$STORAGE/shared"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue