diff options
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | releasenotes/notes/run-trove-api-under-apache-928103ee6b879de2.yaml | 6 |
3 files changed, 8 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 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 000000000..983943109 --- /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. |