aboutsummaryrefslogtreecommitdiff
path: root/docker/trove
diff options
context:
space:
mode:
authorwu.chunyang <wuchunyang@yovole.com>2022-08-26 15:06:48 +0800
committerMichal Nasiadka <mnasiadka@gmail.com>2023-01-30 13:34:49 +0000
commit1bb082d35a03579d7b762d9691aef86c5b428534 (patch)
tree0626d19cbc6950fc79a39a42c1e544e1754871fa /docker/trove
parentab70c7618b3b7e025759fe38c8692f66ef420b15 (diff)
downloadkolla-1bb082d35a03579d7b762d9691aef86c5b428534.tar.gz
kolla-1bb082d35a03579d7b762d9691aef86c5b428534.zip
Switch trove-api to wsgi running under apache.
Drop 'USER trove' from trove-api, trove-api runs under apache needs run as root Change-Id: I8882484b32a3a3fbde52f58c1209e8c127ea9931
Diffstat (limited to 'docker/trove')
-rw-r--r--docker/trove/trove-api/Dockerfile.j22
-rw-r--r--docker/trove/trove-api/extend_start.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index 3281215b4..ad20e664f 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -12,5 +12,3 @@ RUN chmod 644 /usr/local/bin/kolla_trove_extend_start
{% block trove_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
-
-USER trove
diff --git a/docker/trove/trove-api/extend_start.sh b/docker/trove/trove-api/extend_start.sh
index 76839e2d4..02314baa7 100644
--- a/docker/trove/trove-api/extend_start.sh
+++ b/docker/trove/trove-api/extend_start.sh
@@ -6,3 +6,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
trove-manage db_sync
exit 0
fi
+
+. /usr/local/bin/kolla_httpd_setup