diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-29 12:36:22 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-10 09:13:27 +0200 |
| commit | 21b04376e3339e1cb987e6877e8431ea054c6502 (patch) | |
| tree | ddb894c438316b5e5d1e6c2465d05887263508d7 /docker/mariadb | |
| parent | 76bc0f69cc801a5e5796f1a8a70c13d6355bd6c8 (diff) | |
| download | kolla-21b04376e3339e1cb987e6877e8431ea054c6502.tar.gz kolla-21b04376e3339e1cb987e6877e8431ea054c6502.zip | |
mariadb: handle lack of external repos on non x86
MariaDB-* packages are from external 'x86_64 only' repository. Other
architectures use CentOS packages.
Split needs to be done as 'mariadb-devel' is provided by three different
packages on x86-64.
Partially-Implements: blueprint multiarch-and-arm64-containers
Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a
Change-Id: I9f3394eb35723f2bbf3205c6af6101b5a9daed38
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 74834f9fb..852d70b20 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -12,14 +12,28 @@ MAINTAINER {{ maintainer }} 'expect', 'galera', 'hostname', - 'MariaDB-client', - 'MariaDB-Galera-server', 'percona-xtrabackup', 'pv', 'rsync', 'socat', 'tar' ] %} + + # On x86-64 packages from external repos are used. lowercase names goes + # conflicts and build fails. Other architectures use standard CentOS + # packages. + {% if base_arch == 'x86_64' %} + {% set mariadb_packages = mariadb_packages + [ + 'MariaDB-client', + 'MariaDB-Galera-server' + ] %} + {% else %} + {% set mariadb_packages = mariadb_packages + [ + 'mariadb', + 'mariadb-galera-server' + ] %} + {% endif %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set mariadb_packages = [ 'expect', |
