Skip to content

Commit fd77e12

Browse files
committed
Remove Azure dpkg setup
1 parent 2bb8e55 commit fd77e12

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

linux/build/system/packages/03-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euxo pipefail
33

44
apt-fast install \
5-
moby-engine moby-cli moby-buildx moby-compose \
5+
docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
66
supervisor
77
usermod -aG docker runner
88

linux/build/system/setup-dpkg.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/usr/bin/bash
22
set -euxo pipefail
33

4-
sed -i 's/http:\/\/archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
5-
sed -i 's/http:\/\/[a-z][a-z]\.archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
6-
74
echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80retries
85
echo "APT::Get::Assume-Yes \"true\";" > /etc/apt/apt.conf.d/90assumeyes
96
echo "APT::Get::Never-Include-Phased-Updates \"1\";" > /etc/apt/apt.conf.d/99phased-updates
@@ -31,14 +28,16 @@ apt-fast install --no-install-recommends \
3128
ca-certificates \
3229
software-properties-common
3330

34-
curl -O "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb"
35-
dpkg -i packages-microsoft-prod.deb
36-
curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
37-
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
38-
mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
39-
4031
add-apt-repository universe
4132

33+
install -m 0755 -d /etc/apt/keyrings
34+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
35+
chmod a+r /etc/apt/keyrings/docker.asc
36+
echo \
37+
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
38+
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
39+
tee /etc/apt/sources.list.d/docker.list > /dev/null
40+
4241
apt-fast update
4342
apt-fast dist-upgrade
4443

0 commit comments

Comments
 (0)