aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/ironic-inspector/Dockerfile.j22
-rw-r--r--docker/ironic-inspector/extend_start.sh2
-rw-r--r--docker/ironic/ironic-api/Dockerfile.j22
3 files changed, 2 insertions, 4 deletions
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