diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-18 09:50:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-18 09:50:41 +0000 |
| commit | 5eac240ec66a62265a6a87c6475629d0b60f9a3e (patch) | |
| tree | a1841ff624baae199015b7ee574a74a5d0ff6d0d | |
| parent | 921904ee44b96c4e1169e1254c54f7348ecd9a65 (diff) | |
| parent | 96460c4bfe258c2a39f271a9b5591e76b8b3e783 (diff) | |
| download | kolla-5eac240ec66a62265a6a87c6475629d0b60f9a3e.tar.gz kolla-5eac240ec66a62265a6a87c6475629d0b60f9a3e.zip | |
Merge "base: do not use non-free repositories for Ubuntu"
| -rw-r--r-- | docker/base/sources.list.ubuntu | 8 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.aarch64 | 8 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.ppc64le | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index ccf1d3b1a..d79c758bd 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,12 +1,12 @@ # For non-x86 architectures we use sources.list.ubuntu.<arch> # Default repos -deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic main universe +deb http://archive.ubuntu.com/ubuntu/ bionic-updates main universe +deb http://archive.ubuntu.com/ubuntu/ bionic-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index e7da28a7a..6718d3dcf 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -1,10 +1,10 @@ # Default repos -deb http://ports.ubuntu.com/ bionic main restricted universe multiverse -deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse -deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic main universe +deb http://ports.ubuntu.com/ bionic-updates main universe +deb http://ports.ubuntu.com/ bionic-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le index dae4b688e..16ae1e504 100644 --- a/docker/base/sources.list.ubuntu.ppc64le +++ b/docker/base/sources.list.ubuntu.ppc64le @@ -1,10 +1,10 @@ # Default repos -deb http://ports.ubuntu.com/ bionic main restricted universe multiverse -deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse -deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic main universe +deb http://ports.ubuntu.com/ bionic-updates main universe +deb http://ports.ubuntu.com/ bionic-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. |