diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/sources.list.ubuntu | 24 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.aarch64 | 14 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu.ppc64le | 14 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 15 |
4 files changed, 30 insertions, 37 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index d664f491b..288deb16e 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 bionic main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security main universe +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 # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ bionic-backports main universe +deb http://archive.ubuntu.com/ubuntu/ focal-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 bionic-updates/ussuri main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main # NOTE(hrw): repositories below are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they @@ -22,25 +22,25 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main #deb https://artifacts.elastic.co/packages/5.x/apt stable main # InfluxDB repo -#deb https://repos.influxdata.com/ubuntu bionic stable +#deb https://repos.influxdata.com/ubuntu focal stable # Grafana repo #deb https://packages.grafana.com/oss/deb stable main # Fluentd repo -#deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib +#deb http://packages.treasuredata.com/3/ubuntu/focal/ focal contrib # Qdrouterd repo -#deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main +#deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main # rabbitmq repo -#deb https://dl.bintray.com/rabbitmq/debian/ bionic main +#deb https://dl.bintray.com/rabbitmq/debian/ focal main # erlang repo -#deb https://dl.bintray.com/rabbitmq-erlang/debian/ bionic erlang +#deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang # erlang repo - aarch64 only -#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./ +#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./ # MariaDB repo -#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main +#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index cb18d4dcd..5f6c8f435 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/ bionic main universe -deb http://ports.ubuntu.com/ bionic-updates main universe -deb http://ports.ubuntu.com/ bionic-security main universe +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 # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ bionic-backports main universe +deb http://ports.ubuntu.com/ focal-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 bionic-updates/ussuri main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main # NOTE(hrw): repositories below are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they @@ -17,7 +17,7 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main # Here they stay in case someone needs them. # rabbitmq repo -#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main +#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main # Grafana repo #deb https://packages.grafana.com/oss/deb stable main @@ -26,4 +26,4 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main #deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main # MariaDB repo -#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main +#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le index 6500d7bd3..3dd0d5e7d 100644 --- a/docker/base/sources.list.ubuntu.ppc64le +++ b/docker/base/sources.list.ubuntu.ppc64le @@ -1,14 +1,14 @@ # Default repos -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 +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 # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ bionic-backports main universe +deb http://ports.ubuntu.com/ focal-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 bionic-updates/ussuri main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main # NOTE(hrw): repositories below are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they @@ -17,7 +17,7 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main # Here they stay in case someone needs them. # rabbitmq repo -#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main +#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main # MariaDB repo -#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main +#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 8a2b903ed..4d57b32e3 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -14,17 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-ceilometermiddleware' ] %} {% elif base_package_type == 'deb' %} - {% if base_distro == 'debian' %} - {% set swift_proxy_server_packages = [ - 'swift-proxy', - 'python3-ceilometermiddleware' - ] %} - {% else %} - {% set swift_proxy_server_packages = [ - 'swift-proxy', - 'python-ceilometermiddleware' - ] %} - {% endif %} + {% set swift_proxy_server_packages = [ + 'swift-proxy', + 'python3-ceilometermiddleware' + ] %} {% endif %} {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }} |