From 1bb082d35a03579d7b762d9691aef86c5b428534 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Fri, 26 Aug 2022 15:06:48 +0800 Subject: [PATCH] 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 --- docker/trove/trove-api/Dockerfile.j2 | 2 -- docker/trove/trove-api/extend_start.sh | 2 ++ .../notes/run-trove-api-under-apache-928103ee6b879de2.yaml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/run-trove-api-under-apache-928103ee6b879de2.yaml diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 3281215b4f..ad20e664f0 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 76839e2d4c..02314baa72 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 diff --git a/releasenotes/notes/run-trove-api-under-apache-928103ee6b879de2.yaml b/releasenotes/notes/run-trove-api-under-apache-928103ee6b879de2.yaml new file mode 100644 index 0000000000..9839431096 --- /dev/null +++ b/releasenotes/notes/run-trove-api-under-apache-928103ee6b879de2.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Switch trove-api to wsgi running under apache. Replace trove + user with root user in trove-api image, services running under + apache need root privilege.