From b225504bce6b1379f05165f0f464269962c16b0c Mon Sep 17 00:00:00 2001
From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com>
Date: Tue, 15 Aug 2023 05:14:52 +0000
Subject: [PATCH] update

---
 dockerfiles/Dockerfile_CN_aarch64_7 | 33 ------------------
 dockerfiles/Dockerfile_CN_x86_64_7  | 52 -----------------------------
 dockerfiles/build.sh                |  2 --
 3 files changed, 87 deletions(-)
 delete mode 100644 dockerfiles/Dockerfile_CN_aarch64_7
 delete mode 100644 dockerfiles/Dockerfile_CN_x86_64_7

diff --git a/dockerfiles/Dockerfile_CN_aarch64_7 b/dockerfiles/Dockerfile_CN_aarch64_7
deleted file mode 100644
index cb4a918..0000000
--- a/dockerfiles/Dockerfile_CN_aarch64_7
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM debian:11
-
-#set mirror
-RUN rm /etc/apt/sources.list && \
-echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye main contrib non-free" >> /etc/apt/sources.list && \
-echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
-echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
-echo "deb http://mirrors.ustc.edu.cn/debian-security bullseye-security main contrib" >> /etc/apt/sources.list
-
-#install base pkg
-RUN apt-get update && \
-apt-get install wget systemctl nano vim curl gnupg  ca-certificates -y
-
-#add proxmox repo
-#use jiangcuo_proxmox_arm64 https://github.com/jiangcuo/Proxmox-Arm64
-RUN echo "deb https://mirrors.apqa.cn/proxmox/ pvearm  main">/etc/apt/sources.list.d/foxi.list && \
-    wget --no-check-certificate https://mirrors.apqa.cn/proxmox/gpg.key -O /etc/apt/trusted.gpg.d/gpg.key && \
-    chmod +r /etc/apt/trusted.gpg.d/gpg.key
-
-#intall proxmox-ve without recommends. 
-RUN apt-get update && \
-DEBIAN_FRONTEND=noninteractiv apt-get -y --no-install-recommends  install  proxmox-ve || echo ok
-
-
-#set passwd for root
-RUN echo "root:root"|chpasswd
-
-#clean
-RUN rm -rf /var/lib/apt/lists/*  /*.deb
-
-#use setup.sh to start proxmox service
-STOPSIGNAL SIGINT
-CMD [ "/lib/systemd/systemd", "log-level=info", "unit=sysinit.target"]
diff --git a/dockerfiles/Dockerfile_CN_x86_64_7 b/dockerfiles/Dockerfile_CN_x86_64_7
deleted file mode 100644
index e815ba3..0000000
--- a/dockerfiles/Dockerfile_CN_x86_64_7
+++ /dev/null
@@ -1,52 +0,0 @@
-FROM debian:11
-
-#set mirror
-RUN rm /etc/apt/sources.list && \
-    echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.ustc.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.ustc.edu.cn/debian-security bullseye-security main contrib" >> /etc/apt/sources.list
-
-#install base pkg
-RUN apt-get update && \
-    apt-get install wget systemctl nano vim curl gnupg  ca-certificates -y
-
-#add proxmox repo
-RUN echo "deb http://mirrors.ustc.edu.cn/proxmox/debian/ bullseye pve-no-subscription" >>/etc/apt/sources.list && \
-    wget --no-check-certificate https://mirrors.ustc.edu.cn/proxmox/debian/proxmox-release-bullseye.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg && \
-    chmod +r /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
-
-#repacked proxmox-ve
-RUN wget https://mirrors.ustc.edu.cn/proxmox/debian/dists/bullseye/pve-no-subscription/binary-amd64/proxmox-ve_7.2-1_all.deb && \
-    mkdir /tmp/pve && \
-    dpkg -X proxmox-ve_7.2-1_all.deb /tmp/pve/ && \
-    dpkg -e proxmox-ve_7.2-1_all.deb /tmp/pve/DEBIAN && \
-    sed -i "s/pve-kernel-helper,//g" /tmp/pve/DEBIAN/control && \
-    sed -i "s/pve-kernel-5.15,//g" /tmp/pve/DEBIAN/control && \
-    dpkg-deb -Zxz  -b /tmp/pve/ /tmp/
-
-
-#repacked pve-manager
-RUN wget https://mirrors.ustc.edu.cn/proxmox/debian/dists/bullseye/pve-no-subscription/binary-amd64/pve-manager_7.2-7_amd64.deb && \
-    mkdir /tmp/pve-manager && \
-    dpkg -X pve-manager_7.2-7_amd64.deb  /tmp/pve-manager/ && \
-    dpkg -e pve-manager_7.2-7_amd64.deb /tmp/pve-manager/DEBIAN && \
-    sed -i "s/ifupdown2 (>= 2.0.1-1+pve8) | ifenslave (>= 2.6),//g" /tmp/pve-manager/DEBIAN/control && \
-    dpkg-deb -Zxz  -b /tmp/pve-manager/ /tmp
-
-#intall proxmox-ve without recommends. ifupdown2 will install failed but ok
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractiv apt-get -y --no-install-recommends  install  proxmox-ve || echo ok
-
-##install again
-RUN dpkg -i /tmp/*.deb || echo ok
-
-#set passwd for root
-RUN echo "root:root"|chpasswd
-
-#clean
-RUN rm -rf /var/lib/apt/lists/*  /*.deb
-
-#use setup.sh to start proxmox service
-STOPSIGNAL SIGINT
-CMD [ "/lib/systemd/systemd", "log-level=info", "unit=sysinit.target"]
\ No newline at end of file
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
index a51e911..c5762b0 100644
--- a/dockerfiles/build.sh
+++ b/dockerfiles/build.sh
@@ -252,9 +252,7 @@ if ! command -v docker-compose > /dev/null 2>&1; then
 fi
 
 # Dockerfile_x86_64_7
-# Dockerfile_CN_x86_64_7
 # Dockerfile_aarch64_7
-# Dockerfile_CN_aarch64_7
 tag="x86_64_7"
 docker_file_name="Dockerfile_x86_64_7"
 curl -Lk "${cdn_success_url}https://raw.githubusercontent.com/spiritLHLS/pve/main/dockerfiles/${docker_file_name}" -o /root/Dockerfile