aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-17 19:44:51 +0000
committerGerrit Code Review <review@openstack.org>2015-08-17 19:44:51 +0000
commit1d2ee08a4731306b9ce068bd948d85d0acdbe2d4 (patch)
treee0407e6540f7c84e36131c95bb414d97197bd0f5
parent4148109162620164d9bff239f3b56a2f2eb0c433 (diff)
parent91026e78bf8bd6a50d5b7828e441ac108dcb8941 (diff)
downloadkolla-1d2ee08a4731306b9ce068bd948d85d0acdbe2d4.tar.gz
kolla-1d2ee08a4731306b9ce068bd948d85d0acdbe2d4.zip
Merge "Make gnocchi-base build from source"
-rw-r--r--docker/centos/source/base/Dockerfile1
-rw-r--r--docker_templates/base/Dockerfile.j22
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
index e8e96e777..43e8d1a76 100644
--- a/docker/centos/source/base/Dockerfile
+++ b/docker/centos/source/base/Dockerfile
@@ -5,6 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y \
epel-release \
gcc \
+ gcc-c++ \
git \
libffi-devel \
libxml2-devel \
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2
index 4e6624b63..fb7ff4f62 100644
--- a/docker_templates/base/Dockerfile.j2
+++ b/docker_templates/base/Dockerfile.j2
@@ -145,6 +145,7 @@ RUN yum update -y \
&& yum install -y \
epel-release \
gcc \
+ gcc-c++ \
git \
libffi-devel \
libxml2-devel \
@@ -185,6 +186,7 @@ RUN apt-get update \
RUN apt-get install -y --no-install-recommends \
gcc \
+ gcc-c++ \
git \
ldap-utils \
libffi-dev \