From c862b076f71643bd9062ed6f8131e0570edfd441 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Fri, 27 Sep 2024 09:11:28 +0000 Subject: Revert "Pin OpenSearch Dashboards to 2.15" This reverts commit 3c49991a86cb26dd0447fa748d1df9df5aed92bb. Reason for revert: bug fixed upstream https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8097 Change-Id: Icc810554dc877c9dedaf26609d59a93059a38ba7 --- docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 15 +-------------- .../apt_preferences_opensearch_dashboards | 3 --- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards (limited to 'docker') diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index ee3ffa41b..a4bbd29f4 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -10,20 +10,7 @@ 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']) }} -# 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 %} +{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} {{ 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 deleted file mode 100644 index 78bcda585..000000000 --- a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards +++ /dev/null @@ -1,3 +0,0 @@ -Package: opensearch-dashboards -Pin: version 2.15.* -Pin-Priority: 1000 -- cgit v1.2.3