From 7a170f8930411379923131039831147bdcff1c61 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 4 Dec 2017 13:41:37 +0000 Subject: neutron-server-opendaylight: make it buildable on non-x86 When built from source JPEG headers are needed on !x86-64 architectures. Change-Id: Iefeb4658b6633c694495e1de3aa26af63693cb29 --- docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'docker') 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 = [ -- cgit v1.2.3