JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Preparation for http proxy caching (#8281)

Browse Source 
* always use http for apt repos

* pass possible proxy arguments to docker

* populate lower-case env variables with upper-case ones if not set otherwise
This commit is contained in:
Werner
2025-06-13 08:31:24 +00:00
committed by GitHub
parent 0e388bb514
commit 15407330c6
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/apa.sh
View File

@@ -5,7 +5,7 @@ function extension_prepare_config__apa() {
} }
function custom_apt_repo__add_apa() { function custom_apt_repo__add_apa() {
run_host_command_logged echo "deb [signed-by=${APT_SIGNING_KEY_FILE}] https://github.armbian.com/apa current main" "|" tee "${SDCARD}"/etc/apt/sources.list.d/armbian-apa.list run_host_command_logged echo "deb [signed-by=${APT_SIGNING_KEY_FILE}] http://github.armbian.com/apa current main" "|" tee "${SDCARD}"/etc/apt/sources.list.d/armbian-apa.list
} }
function post_armbian_repo_customize_image__install_from_apa() { function post_armbian_repo_customize_image__install_from_apa() {

2
extensions/armbian-config.sh
View File

@@ -5,7 +5,7 @@
function custom_apt_repo__add_armbian-github-repo() { function custom_apt_repo__add_armbian-github-repo() {
cat <<- EOF > "${SDCARD}"/etc/apt/sources.list.d/armbian-config.sources cat <<- EOF > "${SDCARD}"/etc/apt/sources.list.d/armbian-config.sources
Types: deb Types: deb
URIs: https://github.armbian.com/configng URIs: http://github.armbian.com/configng
Suites: stable Suites: stable
Components: main Components: main
Signed-By: ${APT_SIGNING_KEY_FILE} Signed-By: ${APT_SIGNING_KEY_FILE}

7
lib/functions/host/docker.sh
View File

@@ -409,6 +409,13 @@ function docker_cli_prepare_launch() {
"--env" "GITHUB_SHA=${GITHUB_SHA}" "--env" "GITHUB_SHA=${GITHUB_SHA}"
"--env" "GITHUB_WORKFLOW=${GITHUB_WORKFLOW}" "--env" "GITHUB_WORKFLOW=${GITHUB_WORKFLOW}"
"--env" "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" "--env" "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
# Pass proxy args
"--env" "http_proxy=${http_proxy:-${HTTP_PROXY}}"
"--env" "https_proxy=${https_proxy:-${HTTPS_PROXY}}"
"--env" "HTTP_PROXY=${HTTP_PROXY}"
"--env" "HTTPS_PROXY=${HTTPS_PROXY}"
"--env" "APT_PROXY_ADDR=${APT_PROXY_ADDR}"
) )
# This env var is used super early (in entrypoint.sh), so set it as an env to current value. # This env var is used super early (in entrypoint.sh), so set it as an env to current value.

2
lib/functions/rootfs/distro-specific.sh
View File

@@ -196,7 +196,7 @@ function create_sources_list_and_deploy_repo_key() {
fi fi
cat <<- EOF > "${basedir}"/etc/apt/sources.list.d/armbian.sources cat <<- EOF > "${basedir}"/etc/apt/sources.list.d/armbian.sources
Types: deb Types: deb
URIs: https://${armbian_mirror} URIs: http://${armbian_mirror}
Suites: $RELEASE Suites: $RELEASE
Components: ${components[*]} Components: ${components[*]}
Signed-By: ${APT_SIGNING_KEY_FILE} Signed-By: ${APT_SIGNING_KEY_FILE}