aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2017-12-04 13:41:37 +0000
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2017-12-04 13:43:21 +0000
commit7a170f8930411379923131039831147bdcff1c61 (patch)
tree1f8f33cff1556777e3735a27f421e3903fa1da93 /docker
parent0f7141f1ceacee5ff7191504ce32a588af76667b (diff)
downloadkolla-7a170f8930411379923131039831147bdcff1c61.tar.gz
kolla-7a170f8930411379923131039831147bdcff1c61.zip
neutron-server-opendaylight: make it buildable on non-x86
When built from source JPEG headers are needed on !x86-64 architectures. Change-Id: Iefeb4658b6633c694495e1de3aa26af63693cb29
Diffstat (limited to 'docker')
-rw-r--r--docker/neutron/neutron-server-opendaylight/Dockerfile.j214
1 files changed, 14 insertions, 0 deletions
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
index ad317de2f..b59feeb21 100644
--- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
+++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
@@ -18,6 +18,20 @@ USER root
{% elif install_type == 'source' %}
+ {% if base_arch not in ['x86_64'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set neutron_server_opendaylight_packages = [
+ 'libjpeg-devel'
+ ] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% set neutron_server_opendaylight_packages = [
+ 'libjpeg-dev'
+ ] %}
+ {% endif %}
+
+{{ macros.install_packages(neutron_server_opendaylight_packages | customizable("packages")) }}
+ {% endif %}
+
ADD plugins-archive /
{% set neutron_server_opendaylight_plugins_pip_packages = [