aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2022-04-27 15:47:41 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-07-27 11:27:01 +0200
commit9f25aac18a31920c2f2f6630b35f3f734f03dcf4 (patch)
treea837f3fcb359a5f0f0726d15d8ad1d777e56262a /docker
parentdc55bdb5eee7c41660c7ef7a5bd5064d95f003f4 (diff)
downloadkolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.tar.gz
kolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.zip
Move to Ubuntu Jammy (22.04)
mariadb - downloads.mariadb.com doesn't have jammy version, should be there soon - using Ubuntu provided version for now telegraf/collectd - collectd packages missing in Jammy - marked as unbuildable monasca - requires new librdkafka, no wheel for Python 3.10 for now Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/846070 Change-Id: I11b4fbcaba165824252902d0270ce1dbbc3d6e9d
Diffstat (limited to 'docker')
-rw-r--r--docker/base/sources.list.ubuntu10
-rw-r--r--docker/base/sources.list.ubuntu.aarch6410
2 files changed, 10 insertions, 10 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index c7d072c32..1dfa5da5f 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -1,16 +1,16 @@
# For non-x86 architectures we use sources.list.ubuntu.<arch>
# Default repos
-deb mirror://mirrors.ubuntu.com/mirrors.txt focal main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt focal-updates main universe
-deb mirror://mirrors.ubuntu.com/mirrors.txt focal-security main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt jammy main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-updates main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-security main universe
# Backports have a lower priority and must be explicitly installed to be used
-deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe
+deb http://archive.ubuntu.com/ubuntu/ jammy-backports main universe
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/yoga main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/zed main
# NOTE(hrw): extra repositories are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64
index b975b017b..3420c86c4 100644
--- a/docker/base/sources.list.ubuntu.aarch64
+++ b/docker/base/sources.list.ubuntu.aarch64
@@ -1,14 +1,14 @@
# Default repos
-deb http://ports.ubuntu.com/ focal main universe
-deb http://ports.ubuntu.com/ focal-updates main universe
-deb http://ports.ubuntu.com/ focal-security main universe
+deb http://ports.ubuntu.com/ jammy main universe
+deb http://ports.ubuntu.com/ jammy-updates main universe
+deb http://ports.ubuntu.com/ jammy-security main universe
# Backports have a lower priority and must be explicitly installed to be used
-deb http://ports.ubuntu.com/ focal-backports main universe
+deb http://ports.ubuntu.com/ jammy-backports main universe
# We need to add the repo for the updated packages they provide. The main ones
# are qemu, libvirt, and openvswitch.
-deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/yoga main
+#deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/zed main
# NOTE(hrw): extra repositories are added into image when they are needed as
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they