From 115cb80a04cc975dcb5266690eb53c857540e69e Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 17 Apr 2023 20:34:11 +0800 Subject: [PATCH] add dockerproxy to accelerate ghcr.io --- lib/functions/artifacts/artifact-armbian-bsp-cli.sh | 2 +- lib/functions/artifacts/artifact-armbian-bsp-desktop.sh | 2 +- lib/functions/artifacts/artifact-armbian-config.sh | 2 +- lib/functions/artifacts/artifact-armbian-desktop.sh | 2 +- .../artifacts/artifact-armbian-plymouth-theme.sh | 2 +- lib/functions/artifacts/artifact-armbian-zsh.sh | 2 +- .../artifacts/artifact-fake-ubuntu-advantage-tools.sh | 2 +- lib/functions/artifacts/artifact-firmware.sh | 2 +- lib/functions/artifacts/artifact-full_firmware.sh | 2 +- lib/functions/artifacts/artifact-kernel.sh | 2 +- lib/functions/artifacts/artifact-rootfs.sh | 2 +- lib/functions/artifacts/artifact-uboot.sh | 2 +- lib/functions/compilation/kernel-git-oras.sh | 2 +- lib/functions/configuration/main-config.sh | 9 +++++++++ 14 files changed, 22 insertions(+), 13 deletions(-) diff --git a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh index 06aeed12d..e95ddc082 100644 --- a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh +++ b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh @@ -125,7 +125,7 @@ function artifact_armbian-bsp-cli_cli_adapter_config_prep() { } function artifact_armbian-bsp-cli_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-bsp-cli_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh b/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh index e2909ebfe..9a87511bc 100644 --- a/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh +++ b/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh @@ -93,7 +93,7 @@ function artifact_armbian-bsp-desktop_cli_adapter_config_prep() { } function artifact_armbian-bsp-desktop_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-bsp-desktop_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-armbian-config.sh b/lib/functions/artifacts/artifact-armbian-config.sh index e3e2cee9d..e0c95a089 100644 --- a/lib/functions/artifacts/artifact-armbian-config.sh +++ b/lib/functions/artifacts/artifact-armbian-config.sh @@ -82,7 +82,7 @@ function artifact_armbian-config_cli_adapter_config_prep() { } function artifact_armbian-config_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-config_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-armbian-desktop.sh b/lib/functions/artifacts/artifact-armbian-desktop.sh index fa9fb9b58..e6efdd2ec 100644 --- a/lib/functions/artifacts/artifact-armbian-desktop.sh +++ b/lib/functions/artifacts/artifact-armbian-desktop.sh @@ -92,7 +92,7 @@ function artifact_armbian-desktop_cli_adapter_config_prep() { } function artifact_armbian-desktop_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-desktop_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh b/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh index df6fe2774..ab98995c8 100644 --- a/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh +++ b/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh @@ -68,7 +68,7 @@ function artifact_armbian-plymouth-theme_cli_adapter_config_prep() { } function artifact_armbian-plymouth-theme_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-plymouth-theme_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-armbian-zsh.sh b/lib/functions/artifacts/artifact-armbian-zsh.sh index 3269266dd..123d5c2b7 100644 --- a/lib/functions/artifacts/artifact-armbian-zsh.sh +++ b/lib/functions/artifacts/artifact-armbian-zsh.sh @@ -83,7 +83,7 @@ function artifact_armbian-zsh_cli_adapter_config_prep() { } function artifact_armbian-zsh_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_armbian-zsh_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh b/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh index 0ada08018..503cd28e6 100644 --- a/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh +++ b/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh @@ -68,7 +68,7 @@ function artifact_fake_ubuntu_advantage_tools_cli_adapter_config_prep() { } function artifact_fake_ubuntu_advantage_tools_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-packages/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-packages/" } function artifact_fake_ubuntu_advantage_tools_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-firmware.sh b/lib/functions/artifacts/artifact-firmware.sh index 555dd99f3..f362eb176 100644 --- a/lib/functions/artifacts/artifact-firmware.sh +++ b/lib/functions/artifacts/artifact-firmware.sh @@ -83,7 +83,7 @@ function artifact_firmware_cli_adapter_config_prep() { } function artifact_firmware_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-firmware/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-firmware/" } function artifact_firmware_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-full_firmware.sh b/lib/functions/artifacts/artifact-full_firmware.sh index 5f07f0ef2..bf6ca52a4 100644 --- a/lib/functions/artifacts/artifact-full_firmware.sh +++ b/lib/functions/artifacts/artifact-full_firmware.sh @@ -94,7 +94,7 @@ function artifact_full_firmware_cli_adapter_config_prep() { } function artifact_full_firmware_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-firmware/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-firmware/" } function artifact_full_firmware_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-kernel.sh b/lib/functions/artifacts/artifact-kernel.sh index 2fb792b45..4baf7c5a2 100644 --- a/lib/functions/artifacts/artifact-kernel.sh +++ b/lib/functions/artifacts/artifact-kernel.sh @@ -216,7 +216,7 @@ function artifact_kernel_cli_adapter_config_prep() { } function artifact_kernel_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-kernel/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-kernel/" } function artifact_kernel_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-rootfs.sh b/lib/functions/artifacts/artifact-rootfs.sh index e686e6137..bd7325114 100644 --- a/lib/functions/artifacts/artifact-rootfs.sh +++ b/lib/functions/artifacts/artifact-rootfs.sh @@ -141,7 +141,7 @@ function artifact_rootfs_cli_adapter_config_prep() { } function artifact_rootfs_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-root/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-root/" } function artifact_rootfs_is_available_in_local_cache() { diff --git a/lib/functions/artifacts/artifact-uboot.sh b/lib/functions/artifacts/artifact-uboot.sh index 571ddf2eb..dbbcac05a 100644 --- a/lib/functions/artifacts/artifact-uboot.sh +++ b/lib/functions/artifacts/artifact-uboot.sh @@ -155,7 +155,7 @@ function artifact_uboot_cli_adapter_config_prep() { } function artifact_uboot_get_default_oci_target() { - artifact_oci_target_base="ghcr.io/armbian/cache-uboot/" + artifact_oci_target_base="${GHCR_SOURCE}/armbian/cache-uboot/" } function artifact_uboot_is_available_in_local_cache() { diff --git a/lib/functions/compilation/kernel-git-oras.sh b/lib/functions/compilation/kernel-git-oras.sh index d56cb976e..9edcde7fe 100644 --- a/lib/functions/compilation/kernel-git-oras.sh +++ b/lib/functions/compilation/kernel-git-oras.sh @@ -135,7 +135,7 @@ function kernel_prepare_bare_repo_decide_shallow_or_full() { display_alert "Using ${decision} Kernel bare tree for ${KERNEL_MAJOR_MINOR}" "${decision_why}" "info" - declare base_oras_ref="ghcr.io/armbian/shallow" # @TODO allow changing this + declare base_oras_ref="${GHCR_SOURCE}/armbian/shallow" # @TODO allow changing this declare estimated_dl_size_mib=0 benefits="" cons="" case "${decision}" in shallow) diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 162735c1c..23a08ddc2 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -209,6 +209,15 @@ function do_main_configuration() { ;; esac + case $GHCR_MIRROR in + dockerproxy) + GHCR_SOURCE='ghcr.dockerproxy.com' + ;; + *) + GHCR_SOURCE='ghcr.io' + ;; + esac + # Let's set default data if not defined in board configuration above [[ -z $OFFSET ]] && OFFSET=4 # offset to 1st partition (we use 4MiB boundaries by default) [[ -z $ARCH ]] && ARCH=armhf # makes little sense to default to anything...