diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-05-23 16:14:21 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-05-24 13:49:05 +0000 |
| commit | d793de2a482ea21a3dec90828605f3fb8d9e4380 (patch) | |
| tree | 880200597553e3f9931fdd9c64884eaca97d8216 | |
| parent | 37bc1ffa3abb2dfc2c159de0d4540da50264d646 (diff) | |
| download | kolla-d793de2a482ea21a3dec90828605f3fb8d9e4380.tar.gz kolla-d793de2a482ea21a3dec90828605f3fb8d9e4380.zip | |
opensearch-dashboards: Fix permissions
Since we moved to using rpm/deb packages, the user has changed.
Related-Bug: #2020152
Change-Id: I2a5a0d761223b4e99c8df59f80261108380d5038
(cherry picked from commit 6786e4384c1a19e4658310e109b8ab9704f5eff9)
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/extend_start.sh | 8 | ||||
| -rw-r--r-- | kolla/common/users.py | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index 60693ebc0..c4abf92f3 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }} +{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }} {{ macros.enable_extra_repos(['opensearch-dashboards']) }} {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} @@ -30,4 +30,4 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block opensearch_footer %}{% endblock %} {% block footer %}{% endblock %} -USER opensearch +USER opensearch-dashboards diff --git a/docker/opensearch/opensearch-dashboards/extend_start.sh b/docker/opensearch/opensearch-dashboards/extend_start.sh index fa7872738..608bb34bf 100644 --- a/docker/opensearch/opensearch-dashboards/extend_start.sh +++ b/docker/opensearch/opensearch-dashboards/extend_start.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/opensearch" ]]; then - mkdir -p /var/log/kolla/opensearch +if [[ ! -d "/var/log/kolla/opensearch-dashboards" ]]; then + mkdir -p /var/log/kolla/opensearch-dashboards fi -if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then - chmod 755 /var/log/kolla/opensearch +if [[ $(stat -c %a /var/log/kolla/opensearch-dashboards) != "755" ]]; then + chmod 755 /var/log/kolla/opensearch-dashboards fi export DASHBOARDS_HOME=/usr/share/opensearch-dashboards diff --git a/kolla/common/users.py b/kolla/common/users.py index c47528d93..777ef1364 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -333,5 +333,9 @@ USERS = { 'opensearch-user': { 'uid': 42490, 'gid': 42490, + }, + 'opensearch-dashboards-user': { + 'uid': 42492, + 'gid': 42492, } } |