Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Request: 2024/7/17 6:32pm #654

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
FROM scratch
COPY --from=qemux/qemu-docker:5.16 / /
COPY --from=qemux/qemu-docker:latest / /

ARG VERSION_ARG="0.0"
ARG DEBCONF_NOWARNINGS="yes"
ARG DEBIAN_FRONTEND="noninteractive"
ARG DEBCONF_NONINTERACTIVE_SEEN="true"

RUN set -eu && \
apt-get update && \
apt-get --no-install-recommends -y install \
apt-get --no-install-recommends -yfm --update install \
bc \
curl \
7zip \
Expand All @@ -27,15 +26,15 @@ RUN set -eu && \
COPY --chmod=755 ./src /run/
COPY --chmod=755 ./assets /run/assets

ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd
ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/master/src/wsdd.py /usr/sbin/wsdd
ADD --chmod=664 https://github.com/qemus/virtiso/releases/download/v0.1.248/virtio-win-0.1.248.tar.xz /drivers.txz

EXPOSE 8006 3389
VOLUME /storage

ENV RAM_SIZE "4G"
ENV CPU_CORES "2"
ENV DISK_SIZE "64G"
ENV VERSION "win11"
ENV RAM_SIZE "8G"
ENV CPU_CORES "8"
ENV DISK_SIZE "512G"
ENV VERSION "win11e"

ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
10 changes: 7 additions & 3 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
services:
windows:
image: dockurr/windows
container_name: windows
image: dockurr/windows:latest
platform: "linux/arm64"
privileged: true
enable_ipv6: true
environment:
VERSION: "win11"
VERSION: "win11e"
devices:
- /dev/kvm
- /dev/net/tun:/dev/net/tun
cap_add:
- NET_ADMIN
ports:
- 8006:8006
- 3389:3389/tcp
- 3389:3389/udp
stop_grace_period: 2m
15 changes: 11 additions & 4 deletions kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 64Gi
storage: 512Gi
---
apiVersion: v1
kind: Pod
Expand All @@ -30,24 +30,31 @@ spec:
securityContext:
privileged: true
env:
- name: VERSION
value: "win11e"
- name: RAM_SIZE
value: 4G
value: 8G
- name: CPU_CORES
value: "2"
value: "8"
- name: DISK_SIZE
value: "64G"
value: "512G"
volumeMounts:
- mountPath: /storage
name: storage
- mountPath: /dev/kvm
name: dev-kvm
- mountPath: /dev/net/tun
name: dev-net-tun
volumes:
- name: storage
persistentVolumeClaim:
claimName: windows-pvc
- name: dev-kvm
hostPath:
path: /dev/kvm
- name: dev-net-tun
hostPath:
path: /dev/net/tun
---
apiVersion: v1
kind: Service
Expand Down
Loading