diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-16 18:33:43 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-16 18:33:55 +0000 |
| commit | 340350a387cbbe417eff9385156d665c3edd683d (patch) | |
| tree | bcf8da681d8e989f27e773f0b2b0af5850a3421b /docker/opensearch | |
| parent | 7c098bdd3cac73505851d4c97d7f39e966f00e1b (diff) | |
| download | kolla-340350a387cbbe417eff9385156d665c3edd683d.tar.gz kolla-340350a387cbbe417eff9385156d665c3edd683d.zip | |
Revert "CI/Master only: pin opensearch{-dashboards}"
This reverts commit 19a004e0a500ea4839fa1e089e1c50c953cec3b3.
Reason for revert: Fixed
Change-Id: I5491adef46fe0cec013a597cb05018d8d7e862f0
Diffstat (limited to 'docker/opensearch')
| -rw-r--r-- | docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/opensearch/opensearch/Dockerfile.j2 | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index 09cbdd3b9..a4bbd29f4 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -10,12 +10,6 @@ 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']) }} -# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668 -{% if base_package_type == 'rpm' %} -RUN dnf -y install 'dnf-command(versionlock)' && \ - dnf versionlock add --raw 'opensearch-dashboards-0:2.12.*' -{% endif %} - {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2 index ba90eb228..196cf675b 100644 --- a/docker/opensearch/opensearch/Dockerfile.j2 +++ b/docker/opensearch/opensearch/Dockerfile.j2 @@ -10,11 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }} {{ macros.enable_extra_repos(['opensearch']) }} -# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668 -{% if base_package_type == 'rpm' %} -RUN dnf -y install 'dnf-command(versionlock)' && \ - dnf versionlock add --raw 'opensearch-0:2.12.*' -{% endif %} {% set opensearch_packages = [ 'opensearch' ] %} |