diff --git a/extensions/apa.sh b/extensions/apa.sh index 19e394f72..20330c26e 100644 --- a/extensions/apa.sh +++ b/extensions/apa.sh @@ -5,7 +5,7 @@ function extension_prepare_config__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() { diff --git a/extensions/armbian-config.sh b/extensions/armbian-config.sh index dc850c52f..bdad0d256 100644 --- a/extensions/armbian-config.sh +++ b/extensions/armbian-config.sh @@ -5,7 +5,7 @@ function custom_apt_repo__add_armbian-github-repo() { cat <<- EOF > "${SDCARD}"/etc/apt/sources.list.d/armbian-config.sources Types: deb - URIs: https://github.armbian.com/configng + URIs: http://github.armbian.com/configng Suites: stable Components: main Signed-By: ${APT_SIGNING_KEY_FILE} diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index 0b73ec291..a3f5cbb46 100644 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -409,6 +409,13 @@ function docker_cli_prepare_launch() { "--env" "GITHUB_SHA=${GITHUB_SHA}" "--env" "GITHUB_WORKFLOW=${GITHUB_WORKFLOW}" "--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. diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index 65bd0d14c..8bd537219 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -196,7 +196,7 @@ function create_sources_list_and_deploy_repo_key() { fi cat <<- EOF > "${basedir}"/etc/apt/sources.list.d/armbian.sources Types: deb - URIs: https://${armbian_mirror} + URIs: http://${armbian_mirror} Suites: $RELEASE Components: ${components[*]} Signed-By: ${APT_SIGNING_KEY_FILE}