diff options
| author | Zuul <zuul@review.opendev.org> | 2023-08-21 15:11:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-08-21 15:11:35 +0000 |
| commit | 999cabd6e01eea7ac09ce16f6b44ecd1b5150fa2 (patch) | |
| tree | f6a8c59a06feb1634039545b78d131e935827673 /docker/base | |
| parent | f000360c2d699e5b2bd9bee00e78055deb1540b4 (diff) | |
| parent | 7fa2ac132cce94aae8cd3d196abba342394f6c70 (diff) | |
| download | kolla-999cabd6e01eea7ac09ce16f6b44ecd1b5150fa2.tar.gz kolla-999cabd6e01eea7ac09ce16f6b44ecd1b5150fa2.zip | |
Merge "Move to Debian 12 'bookworm'"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 17 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 8 |
3 files changed, 6 insertions, 21 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9fc935a79..4e9fc3f28 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -254,7 +254,7 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list RUN apt update \ && apt install -y --no-install-recommends extrepo \ - && extrepo enable openstack_zed \ + && extrepo enable openstack_antelope \ && apt purge -y extrepo \ && apt --purge autoremove -y \ && apt clean diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 21e99839e..394fff1fe 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -4,20 +4,5 @@ Pin-Priority: 1000 # NOTE(hrw): we do not want backports unless requested Package: * -Pin: release n=bullseye-backports +Pin: release n=bookworm-backports Pin-Priority: -1000 - -# NOTE(hrw): let us list some backports -# - openvswitch 2.15 -# - ovn 21.06 -# - libvirt 8 -# - qemu 7.* -# - swtpm -Package: openvswitch* python3-openvswitch ovn-* libvirt* qemu-* swtpm* libtpms0 -Pin: release n=bullseye-backports -Pin-Priority: 1024 - -# NOTE(hrw): Debian OpenStack Team repo has some backports we do not want -Package: git* -Pin: release n=bullseye -Pin-Priority: 1024 diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 4c191417a..89f7a1160 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -1,11 +1,11 @@ # Default repos -deb http://deb.debian.org/debian bullseye main +deb http://deb.debian.org/debian bookworm main # debian security updates -deb http://deb.debian.org/debian-security bullseye-security main +deb http://deb.debian.org/debian-security bookworm-security main # debian updates -deb http://deb.debian.org/debian bullseye-updates main +deb http://deb.debian.org/debian bookworm-updates main # debian backports -deb http://deb.debian.org/debian bullseye-backports main +deb http://deb.debian.org/debian bookworm-backports main |