From f15feef69b0ca97e4074744154beefb3f0e0484d Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 17 Mar 2025 16:42:58 +0100 Subject: [PATCH] feat: Switch to port 80 (#210) --- Dockerfile | 2 +- compose.yml | 2 +- kubernetes.yml | 2 +- readme.md | 4 ++-- src/reset.sh | 4 ++++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 612d195..1306a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ ADD --chmod=664 https://raw.githubusercontent.com/qemus/qemu/master/web/conf/man ADD --chmod=744 https://raw.githubusercontent.com/qemus/qemu/master/web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf VOLUME /storage -EXPOSE 22 5900 8006 +EXPOSE 22 80 5900 ENV CPU_CORES="1" ENV RAM_SIZE="1G" diff --git a/compose.yml b/compose.yml index 1f4c834..61eee84 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,7 @@ services: cap_add: - NET_ADMIN ports: - - 8006:8006 + - 8006:80 volumes: - ./qemu:/storage restart: always diff --git a/kubernetes.yml b/kubernetes.yml index 7ad8693..f690ad5 100644 --- a/kubernetes.yml +++ b/kubernetes.yml @@ -76,7 +76,7 @@ spec: - name: http port: 8006 protocol: TCP - targetPort: 8006 + targetPort: 80 - name: vnc port: 5900 protocol: TCP diff --git a/readme.md b/readme.md index 5b9d0ac..567edc8 100644 --- a/readme.md +++ b/readme.md @@ -39,7 +39,7 @@ services: cap_add: - NET_ADMIN ports: - - 8006:8006 + - 8006:80 volumes: - ./qemu:/storage restart: always @@ -49,7 +49,7 @@ services: Via Docker CLI: ```bash -docker run -it --rm --name qemu -e "BOOT=alpine" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v ${PWD:-.}/qemu:/storage --stop-timeout 120 qemux/qemu-arm +docker run -it --rm --name qemu -e "BOOT=alpine" -p 8006:80 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v ${PWD:-.}/qemu:/storage --stop-timeout 120 qemux/qemu-arm ``` Via Kubernetes: diff --git a/src/reset.sh b/src/reset.sh index 4ecfb91..55f38e7 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -69,6 +69,10 @@ CPU="${CPU// 8 Core/}" CPU="${CPU// 16 Core/}" CPU="${CPU// 32 Core/}" CPU="${CPU// 64 Core/}" +CPU="${CPU//12th Gen /}" +CPU="${CPU//13th Gen /}" +CPU="${CPU//14th Gen /}" +CPU="${CPU//15th Gen /}" CPU="${CPU// Processor/}" CPU="${CPU// Quad core/}" CPU="${CPU// Core TM/ Core}"