From 7fa63e2b95b104d0a626378e744c575937883c99 Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:30:33 +0200
Subject: [PATCH] [ubuntu] Update apt sources (#8075)

---
 images/linux/scripts/base/apt-ubuntu-archive.sh | 15 +++++++++------
 images/linux/ubuntu2004.json                    |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/images/linux/scripts/base/apt-ubuntu-archive.sh b/images/linux/scripts/base/apt-ubuntu-archive.sh
index 3a47d5b00..db4445228 100644
--- a/images/linux/scripts/base/apt-ubuntu-archive.sh
+++ b/images/linux/scripts/base/apt-ubuntu-archive.sh
@@ -1,12 +1,15 @@
 #!/bin/bash -e
 ################################################################################
 ##  File:  apt-ubuntu-archive.sh
-##  Desc:  Script for adding additional apt repo to /etc/apt/sources.list and /etc/cloud/templates/sources.list.ubuntu.tmpl
+##  Desc:  Script for configuring apt sources. https://manpages.ubuntu.com/manpages/jammy/en/man1/apt-transport-mirror.1.html
 ################################################################################
 
-echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
-echo "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-updates main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
+touch /etc/apt/apt-mirrors.txt
 
-echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security main restricted" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
-echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security universe" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
-echo "deb http://security.ubuntu.com/ubuntu/ $(lsb_release -cs)-security multiverse" | tee -a /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
+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
+
+sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list
+
+cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
\ No newline at end of file
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index e89da3bb7..bfe69eaac 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -84,7 +84,7 @@
         },
         {
             "type": "shell",
-            "script": "{{template_dir}}/scripts/base/apt.sh",
+            "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh",
             "environment_vars": [
                 "DEBIAN_FRONTEND=noninteractive"
             ],
@@ -92,7 +92,7 @@
         },
         {
             "type": "shell",
-            "script": "{{template_dir}}/scripts/base/apt-ubuntu-archive.sh",
+            "script": "{{template_dir}}/scripts/base/apt.sh",
             "environment_vars": [
                 "DEBIAN_FRONTEND=noninteractive"
             ],