diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-06 12:24:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-06 12:24:52 +0000 |
| commit | c4b12b1ace851b719d63d696ae6a221d535876fb (patch) | |
| tree | c46c2018528ce081517e15f1142c3c780783c44e /docker | |
| parent | 8ae55dd0b8e53e2afcc337204c469ca863823f18 (diff) | |
| parent | 3c49991a86cb26dd0447fa748d1df9df5aed92bb (diff) | |
| download | kolla-c4b12b1ace851b719d63d696ae6a221d535876fb.tar.gz kolla-c4b12b1ace851b719d63d696ae6a221d535876fb.zip | |
Merge "Pin OpenSearch Dashboards to 2.15"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index a4bbd29f4..ee3ffa41b 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -10,7 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ 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'] %} +# NOTE(mgoddard): Pinning to 2.15 due to https://bugs.launchpad.net/kolla/+bug/2077319 +{% if base_package_type == 'deb' %} +COPY apt_preferences_opensearch_dashboards /etc/apt/preferences.d/opensearch_dashboards +{% endif %} + +{% if base_package_type == 'rpm' %} + {% set opensearch_dashboards_packages = [ + 'opensearch-dashboards-2.15.*' + ] %} +{% elif base_package_type == 'deb' %} + {% set opensearch_dashboards_packages = [ + 'opensearch-dashboards' + ] %} +{% endif %} {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} diff --git a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards b/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards new file mode 100644 index 000000000..78bcda585 --- /dev/null +++ b/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards @@ -0,0 +1,3 @@ +Package: opensearch-dashboards +Pin: version 2.15.* +Pin-Priority: 1000 |