aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-11-10 04:44:16 -0500
committerSteven Dake <stdake@cisco.com>2015-11-11 14:50:02 -0500
commit5e15ee16deddfa84c765a6cbf72df0a63ef7c78d (patch)
tree9a0a8951b8d5e6780eb37a4b429c524a0c42544c /docker/heat
parentd4379a5cde5dba86bf48c4a12aaed2e16475c29b (diff)
downloadkolla-5e15ee16deddfa84c765a6cbf72df0a63ef7c78d.tar.gz
kolla-5e15ee16deddfa84c765a6cbf72df0a63ef7c78d.zip
install openstack-heat-common in heat-base
the openstack-heat-common package installs the Heat UID/GID. This is necessary pre-work for drop-root for heat services. Change-Id: I247b0209248de144d20f5245973833be5cd8f14f Partially-Implements: blueprint drop-root
Diffstat (limited to 'docker/heat')
-rw-r--r--docker/heat/heat-base/Dockerfile.j210
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 0bfa57afd..c9ab54efc 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -1,7 +1,15 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-{% if install_type == 'source' %}
+{% if install_type == 'binary' %}
+ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+ openstack-heat-common \
+ && yum clean all
+
+ {% endif %}
+{% elif install_type == 'source' %}
ADD heat-base-archive /heat-base-source
RUN ln -s heat-base-source/* heat \