mirror of
https://github.com/actions/runner-images.git
synced 2025-12-11 03:27:05 +00:00
Change URL for packages (#11997)
* fix:URL for packages * chore Add co-author > > Co-authored-by: greg dryke <no-reply@github.com> * chore: Incorporate Review comments * fix: remove redundant initialization
This commit is contained in:
@@ -9,16 +9,16 @@ source $HELPER_SCRIPTS/os.sh
|
||||
touch /etc/apt/apt-mirrors.txt
|
||||
|
||||
printf "http://azure.archive.ubuntu.com/ubuntu/\tpriority:1\n" | tee -a /etc/apt/apt-mirrors.txt
|
||||
printf "http://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt
|
||||
printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt
|
||||
printf "https://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt
|
||||
printf "https://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt
|
||||
|
||||
if is_ubuntu24; then
|
||||
sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources
|
||||
sed -i 's/https:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources
|
||||
|
||||
# Apt changes to survive Cloud Init
|
||||
cp -f /etc/apt/sources.list.d/ubuntu.sources /etc/cloud/templates/sources.list.ubuntu.deb822.tmpl
|
||||
else
|
||||
sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list
|
||||
sed -i 's/https:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list
|
||||
|
||||
# Apt changes to survive Cloud Init
|
||||
cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
|
||||
|
||||
@@ -31,6 +31,8 @@ echo 'APT::Get::Always-Include-Phased-Updates "true";' > /etc/apt/apt.conf.d/99-
|
||||
cat <<EOF >> /etc/apt/apt.conf.d/99bad_proxy
|
||||
Acquire::http::Pipeline-Depth 0;
|
||||
Acquire::http::No-Cache true;
|
||||
Acquire::https::Pipeline-Depth 0;
|
||||
Acquire::https::No-Cache true;
|
||||
Acquire::BrokenProxy true;
|
||||
EOF
|
||||
|
||||
|
||||
@@ -33,6 +33,10 @@ EOF
|
||||
|
||||
# Install libicu70 package for Ubuntu 24
|
||||
if is_ubuntu24 ; then
|
||||
wget http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb
|
||||
wget https://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb
|
||||
|
||||
EXPECTED_LIBICU_SHA512="a6315482d93606e375c272718d2458870b95e4ed4b672ea8640cf7bc2d2c2f41aea13b798b1e417e1ffc472a90c6aad150d3d293aa9bddec48e39106e4042807"
|
||||
ACTUAL_LIBICU_SHA512="$(sha512sum "./libicu70_70.1-2_amd64.deb" | awk '{print $1}')"
|
||||
[ "$EXPECTED_LIBICU_SHA512" = "$ACTUAL_LIBICU_SHA512" ] || { echo "libicu checksum mismatch in configure-dpkg.sh"; exit 1;}
|
||||
sudo apt-get install -y ./libicu70_70.1-2_amd64.deb
|
||||
fi
|
||||
|
||||
@@ -12,7 +12,7 @@ source_key=/usr/share/keyrings/eslerlang.gpg
|
||||
|
||||
# Install Erlang
|
||||
wget -q -O - https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc | gpg --dearmor > $source_key
|
||||
echo "deb [signed-by=$source_key] http://binaries2.erlang-solutions.com/ubuntu $(lsb_release -cs)-esl-erlang-25 contrib" > $source_list
|
||||
echo "deb [signed-by=$source_key] https://binaries2.erlang-solutions.com/ubuntu $(lsb_release -cs)-esl-erlang-25 contrib" > $source_list
|
||||
apt-get update
|
||||
|
||||
apt-get install --no-install-recommends esl-erlang
|
||||
|
||||
@@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/etc-environment.sh
|
||||
# Mozillateam PPA is added manually because sometimes
|
||||
# launchpad portal sends empty answer when trying to add it automatically
|
||||
|
||||
REPO_URL="http://ppa.launchpad.net/mozillateam/ppa/ubuntu"
|
||||
REPO_URL="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/"
|
||||
GPG_FINGERPRINT="0ab215679c571d1c8325275b9bdb3d89ce49ec21"
|
||||
GPG_KEY="/etc/apt/trusted.gpg.d/mozillateam_ubuntu_ppa.gpg"
|
||||
REPO_PATH="/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-focal.list"
|
||||
|
||||
@@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/os.sh
|
||||
# Install libssl1.1 dependency
|
||||
if is_ubuntu22; then
|
||||
focal_list=/etc/apt/sources.list.d/focal-security.list
|
||||
echo "deb http://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}"
|
||||
echo "deb https://archive.ubuntu.com/ubuntu/ focal-security main" | tee "${focal_list}"
|
||||
apt-get update --quiet
|
||||
|
||||
apt-get install --no-install-recommends libssl1.1
|
||||
|
||||
Reference in New Issue
Block a user