Compare commits

..

No commits in common. "master" and "v5.13" have entirely different histories.

30 changed files with 54 additions and 31 deletions

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "codespaces.yml", "dockerComposeFile": "codespaces.yml",
"workspaceFolder": "/workspaces/windows",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -22,7 +22,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
with: with:
fetch-depth: 0 fetch-depth: 0
- -

View file

@ -9,7 +9,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- -
name: Run ShellCheck name: Run ShellCheck
uses: ludeeus/action-shellcheck@master uses: ludeeus/action-shellcheck@master

View file

@ -12,15 +12,13 @@ jobs:
dockerHubDescription: dockerHubDescription:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- - uses: actions/checkout@v5
name: Checkout repo -
uses: actions/checkout@v6 name: Docker Hub Description
- uses: peter-evans/dockerhub-description@v5
name: Docker Hub Description with:
uses: peter-evans/dockerhub-description@v5 username: ${{ secrets.DOCKERHUB_USERNAME }}
with: password: ${{ secrets.DOCKERHUB_TOKEN }}
username: ${{ secrets.DOCKERHUB_USERNAME }} repository: ${{ secrets.DOCKERHUB_REPO }}
password: ${{ secrets.DOCKERHUB_TOKEN }} short-description: ${{ github.event.repository.description }}
repository: ${{ secrets.DOCKERHUB_REPO }} readme-filepath: ./readme.md
short-description: ${{ github.event.repository.description }}
readme-filepath: ./readme.md

View file

@ -15,7 +15,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- -
name: Spelling name: Spelling
uses: reviewdog/action-misspell@v1 uses: reviewdog/action-misspell@v1

View file

@ -3,7 +3,7 @@
ARG VERSION_ARG="latest" ARG VERSION_ARG="latest"
FROM scratch AS build-amd64 FROM scratch AS build-amd64
COPY --from=qemux/qemu:7.29 / / COPY --from=qemux/qemu:7.28 / /
ARG TARGETARCH ARG TARGETARCH
ARG DEBCONF_NOWARNINGS="yes" ARG DEBCONF_NOWARNINGS="yes"
@ -27,7 +27,7 @@ RUN set -eu && \
COPY --chmod=755 ./src /run/ COPY --chmod=755 ./src /run/
COPY --chmod=755 ./assets /run/assets COPY --chmod=755 ./assets /run/assets
ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.49-0/virtio-win-1.9.49.tar.xz /var/drivers.txz ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.48-0/virtio-win-1.9.48.tar.xz /var/drivers.txz
FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64 FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64
FROM build-${TARGETARCH} FROM build-${TARGETARCH}

View file

@ -22,7 +22,7 @@ Windows inside a Docker container.
## Video 📺 ## Video 📺
[![Youtube](https://img.youtube.com/vi/xhGYobuG508/maxresdefault.jpg)](https://www.youtube.com/watch?v=xhGYobuG508) [![Youtube](https://img.youtube.com/vi/xhGYobuG508/0.jpg)](https://www.youtube.com/watch?v=xhGYobuG508)
## Usage 🐳 ## Usage 🐳

View file

@ -1766,7 +1766,7 @@ prepareInstall() {
echo "" echo ""
echo "Call Domain.MoveHere(LocalAdminADsPath, \"$username\")" echo "Call Domain.MoveHere(LocalAdminADsPath, \"$username\")"
echo "" echo ""
echo "Set oLink = WshShell.CreateShortcut(WshShell.SpecialFolders(\"Desktop\") & \"\\Shared.lnk\")" echo "Set oLink = WshShell.CreateShortcut(WshShell.ExpandEnvironmentStrings(\"%userprofile%\\Desktop\\Shared.lnk\"))"
echo "With oLink" echo "With oLink"
echo " .TargetPath = \"\\\\host.lan\\Data\"" echo " .TargetPath = \"\\\\host.lan\\Data\""
echo " .Save" echo " .Save"

View file

@ -76,12 +76,6 @@ finish() {
local pid local pid
local cnt=0 local cnt=0
local reason=$1 local reason=$1
local pids=(
"/var/run/tpm.pid"
"/var/run/wsdd.pid"
"/var/run/samba/nmbd.pid"
"/var/run/samba/smbd.pid"
)
touch "$QEMU_END" touch "$QEMU_END"
@ -120,12 +114,21 @@ finish() {
fi fi
fi fi
for pid in "${pids[@]}"; do pid="/var/run/tpm.pid"
if [[ -s "$pid" ]]; then [ -s "$pid" ] && pKill "$(<"$pid")"
pKill "$(cat "$pid")" rm -f "$pid"
fi
rm -f "$pid" pid="/var/run/wsdd.pid"
done [ -s "$pid" ] && pKill "$(<"$pid")"
rm -f "$pid"
pid="/var/run/samba/nmbd.pid"
[ -s "$pid" ] && pKill "$(<"$pid")"
rm -f "$pid"
pid="/var/run/samba/smbd.pid"
[ -s "$pid" ] && pKill "$(<"$pid")"
rm -f "$pid"
closeNetwork closeNetwork