diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-15 19:16:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-15 19:16:54 +0000 |
| commit | debe4179824005afeaa0d89ab68a9a8acd42103a (patch) | |
| tree | fe5299b7741b45f0bdfbfb25daac3dcfd4a9086e /docker/base | |
| parent | c25f67e9d9116c179d871b728ea38dee3acdea02 (diff) | |
| parent | 4d31ca695bb8d1fe5f1e7f31c14cab4e64827d96 (diff) | |
| download | kolla-debe4179824005afeaa0d89ab68a9a8acd42103a.tar.gz kolla-debe4179824005afeaa0d89ab68a9a8acd42103a.zip | |
Merge "Move to Debian 'buster'"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 46c4a8d79..2087af895 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -328,10 +328,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'tgt'] %} -{% if base_distro in ['debian'] %} - {% set base_apt_packages = base_apt_packages + [ 'udev/stretch-backports' ] %} -{% endif %} - {% set base_compiler_packages = [ 'build-essential' ] %} diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 7cb05cab8..48e2e7137 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -1,12 +1,8 @@ # Default repos -deb http://deb.debian.org/debian stretch main +deb http://deb.debian.org/debian buster main # debian security updates -deb http://security.debian.org/debian-security stretch/updates main - -# Linaro repo for Kolla -# ceph, libvirt, opendaylight, openvswitch, qemu -deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./ +deb http://security.debian.org/debian-security buster/updates main deb https://packages.grafana.com/oss/deb stable main @@ -14,8 +10,4 @@ deb https://packages.grafana.com/oss/deb stable main deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main # main docker repo -deb https://download.docker.com/linux/debian stretch stable - -# Percona XtraBackup repo -deb http://repo.percona.com/apt stretch main - +deb https://download.docker.com/linux/debian buster stable |