aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Kirsch <generalfuzz@gmail.com>2020-04-22 08:57:04 -0700
committerJames Kirsch <generalfuzz@gmail.com>2020-04-22 23:15:45 -0700
commit535fe5c37b11eb82e9c3f5bcf309e02e8004e6fd (patch)
tree39bfdb34380bc480e54bb6838d62c2ee68db6c8f
parentd318e5c1a193914ee90eab1c9a762d61d1b07acb (diff)
downloadkolla-535fe5c37b11eb82e9c3f5bcf309e02e8004e6fd.tar.gz
kolla-535fe5c37b11eb82e9c3f5bcf309e02e8004e6fd.zip
Modify Heat container to execute httpd setup
This patch modifies the Dockerfile for the Heat container so that the root user will execute the container setup scripts. This enables the container httpd configuration script to execute. Partially-Implements: blueprint add-ssl-internal-network Change-Id: Ib7936161bb42ee36d7875baffa31af5dff409844
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j22
-rw-r--r--docker/heat/heat-api/Dockerfile.j22
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index d5fd36531..bcedec273 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -21,5 +21,3 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
{% block heat_api_cfn_footer %}{% endblock %}
{% block footer %}{% endblock %}
-
-USER heat
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 42462eaf7..e69fe1da6 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -21,5 +21,3 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
{% block heat_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
-
-USER heat