From 9a02633fafc6ffad03c45c62f27bf8059fd430f4 Mon Sep 17 00:00:00 2001 From: James Kirsch Date: Thu, 23 Jul 2020 18:55:33 -0700 Subject: Enable mod_wsgi in Ironic API and Inspector container This patch modifies the Dockerfile for both the Ironic API and Inspector so that the 'root' user executes the container setup scripts. This enables the container httpd configuration script to execute. Change-Id: I02b58ac571cd4eb3b9d4a814fe0cb907a3564e23 --- docker/ironic-inspector/Dockerfile.j2 | 2 -- docker/ironic-inspector/extend_start.sh | 2 ++ docker/ironic/ironic-api/Dockerfile.j2 | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index 5d08f3b9f..34307b889 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -58,5 +58,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ {% block ironic_inspector_footer %}{% endblock %} {% block footer %}{% endblock %} - -USER ironic-inspector diff --git a/docker/ironic-inspector/extend_start.sh b/docker/ironic-inspector/extend_start.sh index 2582b017a..93b8bf025 100644 --- a/docker/ironic-inspector/extend_start.sh +++ b/docker/ironic-inspector/extend_start.sh @@ -15,3 +15,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade exit 0 fi + +. /usr/local/bin/kolla_httpd_setup diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 799a0c2d7..d90992ee0 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -30,5 +30,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} - -USER ironic -- cgit v1.2.3