summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2017-06-12 11:24:26 +0200
committerEduardo Gonzalez <dabarren@gmail.com>2017-06-12 20:45:50 +0000
commit6d34ae1ff02701943bea44a377f78ab036b307b4 (patch)
tree18576684f168dcb429f84bcc6233c10cb65c1097
parentce08250f57cf953d5c1efbca5b7b60e00c55e336 (diff)
Fix kolla-toolbox build
``pynacl`` package need ``make`` to build. kolla-toolbox build is failing due ``make`` missing package. pynacl upstream bug: https://github.com/pyca/pynacl/issues/298 Change-Id: Ifbb86ec2888284cfbda5e567cb1748432658953c Closes-Bug: #1697300 (cherry picked from commit 2a3f872bf980eb0e81bc6c1eeb907386fbad934e)
Notes
Notes (review): Code-Review+2: Michal Jastrzebski (inc0) <michal.jastrzebski@intel.com> Code-Review+1: caoyuan <cao.yuan@99cloud.net> Code-Review+2: Jeffrey Zhang <jeffrey.zhang@99cloud.net> Workflow+1: Jeffrey Zhang <jeffrey.zhang@99cloud.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Jun 2017 02:17:17 +0000 Reviewed-on: https://review.openstack.org/473580 Project: openstack/kolla Branch: refs/heads/stable/ocata
-rw-r--r--docker/kolla-toolbox/Dockerfile.j25
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 8f348cb..fe6abf2 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -19,12 +19,13 @@ MAINTAINER {{ maintainer }}
19 'libffi-devel', 19 'libffi-devel',
20 'libxml2-devel', 20 'libxml2-devel',
21 'libxslt-devel', 21 'libxslt-devel',
22 'make',
22 'MariaDB-devel', 23 'MariaDB-devel',
23 'MariaDB-shared', 24 'MariaDB-shared',
24 'MariaDB-client', 25 'MariaDB-client',
26 'openssh-clients',
25 'openssl-devel', 27 'openssl-devel',
26 'python-devel', 28 'python-devel'
27 'openssh-clients'
28 ] %} 29 ] %}
29 30
30{% elif base_distro in ['ubuntu', 'debian'] %} 31{% elif base_distro in ['ubuntu', 'debian'] %}