From 1bb082d35a03579d7b762d9691aef86c5b428534 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Fri, 26 Aug 2022 15:06:48 +0800 Subject: 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 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') 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 -- cgit v1.2.3