diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-03-08 23:35:54 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-05-26 00:24:30 +0800 |
| commit | 14374e715d2a5057a28126c7193cfb6270eabaab (patch) | |
| tree | c3690c24b38273eb5e6a812d1eef6f32e135c2a2 /docker/mariadb | |
| parent | 000159cb6d5da0fffe0ba73051c6c551a0cdd9bd (diff) | |
| download | kolla-14374e715d2a5057a28126c7193cfb6270eabaab.tar.gz kolla-14374e715d2a5057a28126c7193cfb6270eabaab.zip | |
Bump Ubuntu base image to 18.04
Ubuntu 18.04 has been released. We need upgrade to it this cycle.
Changes made in this patch
- Bump ubuntu repo from xenial to bionic. Some repos do not have bionic
packages, so still using xenial repos.
- Drop mariadb, percona and nfs-ganesha repo, because these packages are
already provided by Ubuntu official repo.
- Since qdrouterd does not have bionic repo and xenial packages does not
work on Ubuntu bionic, just add it into ignore image list.
- Use python-rtslib-fb and targetcli-fb rather than python-rtslib
and targetcli
- use xen-utils package name rather than with package version one.
- Seems unsigned repo won't work on Ubuntu bionic, stop using infra
mirrored unsigned repo in gate building job.
Needed-By: https://review.openstack.org/568728
Implement blueprint: ubuntu-bionic
Change-Id: I4e3b0ca669cfbf6316bf591f2d8428fa1a0d6182
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 6af2bfb6c..9e2298668 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -29,17 +29,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mariadb-server' ] %} {% else %} - {% if base_arch == 'aarch64' %} - {% set mariadb_packages = mariadb_packages + [ - 'mariadb-server', - 'percona-xtrabackup' - ] %} - {% else %} - {% set mariadb_packages = mariadb_packages + [ - 'mariadb-galera-server', - 'percona-xtrabackup' - ] %} - {% endif %} + {% set mariadb_packages = mariadb_packages + [ + 'mariadb-server', + 'percona-xtrabackup' + ] %} {% endif %} {% endif %} |
