From 96460c4bfe258c2a39f271a9b5591e76b8b3e783 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 17 Jun 2019 18:19:57 +0200 Subject: base: do not use non-free repositories for Ubuntu Remove restricted and multiverse from ubuntu. restricted is supported software that is non-free. multiverse is unsupported software that is non-free. We should not use any of them. And they are not mirrored by OpenStack infra. Change-Id: I34b9d56559eada96abec13814a2aa91b57055710 --- docker/base/sources.list.ubuntu | 8 ++++---- docker/base/sources.list.ubuntu.aarch64 | 8 ++++---- docker/base/sources.list.ubuntu.ppc64le | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docker') 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. # 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. -- cgit v1.2.3