mirror of
https://github.com/dockur/windows.git
synced 2026-01-13 14:35:27 +00:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7aac1edcf | ||
|
|
ea03c67a04 | ||
|
|
bdb0488151 | ||
|
|
ad6f87046a | ||
|
|
e7a3894210 | ||
|
|
8443559a76 | ||
|
|
6dbac13cd1 | ||
|
|
fd907bb78a | ||
|
|
1a6a2dbad0 | ||
|
|
11a19f6a9d |
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "../codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
@@ -15,6 +15,5 @@
|
||||
"onAutoForward": "ignore"
|
||||
},
|
||||
"dockerComposeFile": "codespaces.yml",
|
||||
"workspaceFolder": "/workspaces/windows",
|
||||
"initializeCommand": "docker system prune --all --force"
|
||||
}
|
||||
|
||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -22,7 +22,7 @@ jobs:
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
-
|
||||
|
||||
2
.github/workflows/check.yml
vendored
2
.github/workflows/check.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
-
|
||||
name: Run ShellCheck
|
||||
uses: ludeeus/action-shellcheck@master
|
||||
|
||||
22
.github/workflows/hub.yml
vendored
22
.github/workflows/hub.yml
vendored
@@ -12,13 +12,15 @@ jobs:
|
||||
dockerHubDescription:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
-
|
||||
name: Docker Hub Description
|
||||
uses: peter-evans/dockerhub-description@v5
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
repository: ${{ secrets.DOCKERHUB_REPO }}
|
||||
short-description: ${{ github.event.repository.description }}
|
||||
readme-filepath: ./readme.md
|
||||
-
|
||||
name: Checkout repo
|
||||
uses: actions/checkout@v6
|
||||
-
|
||||
name: Docker Hub Description
|
||||
uses: peter-evans/dockerhub-description@v5
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
repository: ${{ secrets.DOCKERHUB_REPO }}
|
||||
short-description: ${{ github.event.repository.description }}
|
||||
readme-filepath: ./readme.md
|
||||
|
||||
14
.github/workflows/review.yml
vendored
14
.github/workflows/review.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
uses: actions/checkout@v6
|
||||
-
|
||||
name: Spelling
|
||||
uses: reviewdog/action-misspell@v1
|
||||
@@ -26,7 +26,7 @@ jobs:
|
||||
*.md
|
||||
*.sh
|
||||
reporter: github-pr-review
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: Hadolint
|
||||
uses: reviewdog/action-hadolint@v1
|
||||
@@ -34,28 +34,28 @@ jobs:
|
||||
level: warning
|
||||
reporter: github-pr-review
|
||||
hadolint_ignore: DL3006 DL3008
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: YamlLint
|
||||
uses: reviewdog/action-yamllint@v1
|
||||
with:
|
||||
level: warning
|
||||
reporter: github-pr-review
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: ActionLint
|
||||
uses: reviewdog/action-actionlint@v1
|
||||
with:
|
||||
level: warning
|
||||
reporter: github-pr-review
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: Shellformat
|
||||
uses: reviewdog/action-shfmt@v1
|
||||
with:
|
||||
level: warning
|
||||
shfmt_flags: "-i 2 -ci -bn"
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
-
|
||||
name: Shellcheck
|
||||
uses: reviewdog/action-shellcheck@v1
|
||||
@@ -63,4 +63,4 @@ jobs:
|
||||
level: warning
|
||||
reporter: github-pr-review
|
||||
shellcheck_flags: -x -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028
|
||||
github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
ARG VERSION_ARG="latest"
|
||||
FROM scratch AS build-amd64
|
||||
|
||||
COPY --from=qemux/qemu:7.27 / /
|
||||
COPY --from=qemux/qemu:7.29 / /
|
||||
|
||||
ARG TARGETARCH
|
||||
ARG DEBCONF_NOWARNINGS="yes"
|
||||
@@ -27,7 +27,7 @@ RUN set -eu && \
|
||||
COPY --chmod=755 ./src /run/
|
||||
COPY --chmod=755 ./assets /run/assets
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64
|
||||
FROM build-${TARGETARCH}
|
||||
|
||||
@@ -857,14 +857,14 @@ getLink1() {
|
||||
url="8.x/8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso"
|
||||
;;
|
||||
"win2025" | "win2025-eval" )
|
||||
size=6786627584
|
||||
sum="bf3ef0849c7cb5e818e1035b7466d206af5aa227ace1a3f4b0de2bf00d2e2144"
|
||||
url="server/2025/en-us_windows_server_2025_updated_april_2025_x64_dvd_ea86301d.iso"
|
||||
size=7571058688
|
||||
sum="d273d0a85565ffbc06a3d46313f619103e2830a3373306ddbb9a08b8824f509d"
|
||||
url="server/2025/en-us_windows_server_2025_updated_oct_2025_x64_dvd_6c0c5aa8.iso"
|
||||
;;
|
||||
"win2022" | "win2022-eval" )
|
||||
size=6005706752
|
||||
sum="cea2cb2c09de9910c236e64eae3a801c55e9c77ec25e8d81585e3a4581d24bfb"
|
||||
url="server/2022/en-us_windows_server_2022_updated_april_2025_x64_dvd_3f755ec1.iso"
|
||||
size=6023239680
|
||||
sum="5d6d91efa972cbdd6701d78db1dcf6a34c7024ca931c1718e7cb3d0c6dd54e88"
|
||||
url="server/2022/en-us_windows_server_2022_updated_oct_2025_x64_dvd_26e9af36.iso"
|
||||
;;
|
||||
"win2019" | "win2019-eval" )
|
||||
size=5575774208
|
||||
@@ -1915,16 +1915,16 @@ setMachine() {
|
||||
USB="no"
|
||||
VGA="cirrus"
|
||||
DISK_TYPE="auto"
|
||||
ADAPTER="rtl8139"
|
||||
MACHINE="pc-i440fx-2.4"
|
||||
BOOT_MODE="windows_legacy" ;;
|
||||
BOOT_MODE="windows_legacy"
|
||||
[ -z "${ADAPTER:-}" ] && ADAPTER="pcnet" ;;
|
||||
"win2k"* )
|
||||
VGA="cirrus"
|
||||
MACHINE="pc"
|
||||
USB="pci-ohci"
|
||||
DISK_TYPE="auto"
|
||||
ADAPTER="rtl8139"
|
||||
BOOT_MODE="windows_legacy" ;;
|
||||
BOOT_MODE="windows_legacy"
|
||||
[ -z "${ADAPTER:-}" ] && ADAPTER="rtl8139" ;;
|
||||
"winxp"* | "win2003"* )
|
||||
DISK_TYPE="blk"
|
||||
BOOT_MODE="windows_legacy" ;;
|
||||
|
||||
@@ -135,7 +135,6 @@ startInstall() {
|
||||
if [[ "${VERSION,,}" == "http"* ]]; then
|
||||
|
||||
file=$(basename "${VERSION%%\?*}")
|
||||
file="${file//+/ }"
|
||||
printf -v file '%b' "${file//%/\\x}"
|
||||
file="${file//[!A-Za-z0-9._-]/_}"
|
||||
|
||||
|
||||
27
src/power.sh
27
src/power.sh
@@ -76,6 +76,12 @@ finish() {
|
||||
local pid
|
||||
local cnt=0
|
||||
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"
|
||||
|
||||
@@ -114,21 +120,12 @@ finish() {
|
||||
fi
|
||||
fi
|
||||
|
||||
pid="/var/run/tpm.pid"
|
||||
[ -s "$pid" ] && pKill "$(<"$pid")"
|
||||
rm -f "$pid"
|
||||
|
||||
pid="/var/run/wsdd.pid"
|
||||
[ -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"
|
||||
for pid in "${pids[@]}"; do
|
||||
if [[ -s "$pid" ]]; then
|
||||
pKill "$(cat "$pid")"
|
||||
fi
|
||||
rm -f "$pid"
|
||||
done
|
||||
|
||||
closeNetwork
|
||||
|
||||
|
||||
Reference in New Issue
Block a user