aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-09-26 08:22:04 +0000
committerGerrit Code Review <review@openstack.org>2020-09-26 08:22:04 +0000
commitaeebaf75d5888a9f328809bdfbffd915442fd27f (patch)
tree11d19f36ab073bd30e706082dc112f870ba9e998 /docker
parentfbb04a264968706f6ef8f2c866ebb2d63044fc1a (diff)
parent998067b8494c708c7993006c0421fc9b6d2a466a (diff)
downloadkolla-aeebaf75d5888a9f328809bdfbffd915442fd27f.tar.gz
kolla-aeebaf75d5888a9f328809bdfbffd915442fd27f.zip
Merge "Run Ironic Inspector as ironic-inspector user"
Diffstat (limited to 'docker')
-rw-r--r--docker/ironic-inspector/Dockerfile.j22
-rw-r--r--docker/ironic-inspector/extend_start.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2
index 34307b889..5d08f3b9f 100644
--- a/docker/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic-inspector/Dockerfile.j2
@@ -58,3 +58,5 @@ 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 93b8bf025..2582b017a 100644
--- a/docker/ironic-inspector/extend_start.sh
+++ b/docker/ironic-inspector/extend_start.sh
@@ -15,5 +15,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade
exit 0
fi
-
-. /usr/local/bin/kolla_httpd_setup