diff --git a/3.ci.worker.sh b/3.ci.worker.sh index fc6d18c5db1535a99c61211983d413643465b0d6..9d74836a30a8ca32a46f0024e9889c466a57bdcd 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -7,7 +7,9 @@ cd $CMD_PATH apt install simple-cdd -y cd isodvd rm -rf tmp/mirror/db/lockfile -export atzlinux_debian_mirror_extra="https://apt.atzlinux.com/atzlinux" -export atzlinux_debian_security_mirror="https://mirrors.huaweicloud.com/debian-security/ " -export atzlinux_debian_mirror="https://mirrors.huaweicloud.com/debian/" + +export my_atzlinux_debian_mirror_extra="https://apt.atzlinux.com/atzlinux" +export my_atzlinux_debian_security_mirror="http://192.168.3.103:35780/debian-security/ " +export my_atzlinux_debian_mirror="http://192.168.3.103:35780/debian/" +export my_atzlinux_backports_mirror="http://192.168.3.103:35780/debian/" ./amd64.build.sh diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh index 2e4efaf50b8fce965c91d4aaea7cd07355cee825..b0392330537b3d6394237f6a7a634b029647befd 100755 --- a/isodvd/amd64.build.sh +++ b/isodvd/amd64.build.sh @@ -1,17 +1,21 @@ #!/usr/bin/env bash -set -x - -export atzlinux_debian_mirror_extra=${atzlinux_debian_mirror_extra:="http://txy.atzlinux.com/atzlinux"} -export atzlinux_debian_security_mirror=${atzlinux_debian_security_mirror:="https://mirrors.huaweicloud.com/debian-security/ "} -export atzlinux_debian_mirror=${atzlinux_debian_mirror:="https://mirrors.huaweicloud.com/debian/"} - +set +x +export atzlinux_debian_mirror_extra=${my_atzlinux_debian_mirror_extra:-"https://apt.atzlinux.com/atzlinux"} +export atzlinux_debian_security_mirror=${my_atzlinux_debian_security_mirror:-"https://mirrors.huaweicloud.com/debian-security/ "} +export atzlinux_debian_mirror=${my_atzlinux_debian_mirror:-"https://mirrors.huaweicloud.com/debian/"} +export atzlinux_backports_mirror=${my_atzlinux_backports_mirror:-"https://mirrors.huaweicloud.com/debian/"} build-simple-cdd --force-root \ --debug \ --dvd \ --dist buster \ --locale zh_CN \ --keyboard us \ ---security-mirror ${atzlinux_debian_security_mirror} \ ---debian-mirror ${atzlinux_debian_mirror} \ +--security-mirror \ +$atzlinux_debian_security_mirror \ +--debian-mirror \ +$atzlinux_debian_mirror \ +--backports-mirror \ +$atzlinux_backports_mirror \ -b amd64.build + diff --git a/isodvd/profiles/amd64.build.conf b/isodvd/profiles/amd64.build.conf index 9307bc89d95a27514e7d666d18b2e74356000074..18b0878986a82e4d504dc1c2b0bc367d405985a1 100644 --- a/isodvd/profiles/amd64.build.conf +++ b/isodvd/profiles/amd64.build.conf @@ -1,7 +1,6 @@ mirror_components="main contrib non-free" -debian_mirror_extra=${atzlinux_debian_mirror_extra} -debian_mirror_extra="https://apt.atzlinux.com/atzlinux" +debian_mirror_extra=$atzlinux_debian_mirror_extra mirror_components_extra="main contrib non-free" keyring=/usr/share/keyrings/debian-archive-keyring.gpg,/etc/apt/trusted.gpg.d/atzlinux-archive-v10.gpg