Skip to content

Commit

Permalink
Merge pull request #1551 from wazuh/wj-3539_fix-dashboard-app-name_4.3
Browse files Browse the repository at this point in the history
Fix dashboard app name
  • Loading branch information
alberpilot committed May 17, 2022
2 parents 3311b86 + bac0843 commit 350aa4d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.

## [v4.3.1]

- Fix dashboard app name [#1551](https://github.com/wazuh/wazuh-packages/pull/1551)
- Update SPECS [#1534](https://github.com/wazuh/wazuh-packages/pull/1534)

## [v4.3.0]
Expand Down
16 changes: 8 additions & 8 deletions wazuhapp/opensearch-dashboards/Docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ prepare_env() {
}


download_plugin_platform_sources() {
download_plugin_platform_sources() {
if ! git clone $plugin_platform_app_repo_url --branch "${plugin_platform_version}" --depth=1 plugin_platform_source; then
echo "Error downloading OpenSearch-Dashboards source code from opensearch-project/OpenSearch-Dashboards GitHub repository."
exit 1
fi

mkdir -p plugin_platform_source/plugins
mv plugin_platform_source ${plugin_platform_dir}
mv plugin_platform_source ${plugin_platform_dir}
}


Expand All @@ -91,7 +91,7 @@ install_dependencies () {

sed -i 's/node scripts\/build_ts_refs/node scripts\/build_ts_refs --allow-root/' ${plugin_platform_dir}/package.json
sed -i 's/node scripts\/register_git_hook/node scripts\/register_git_hook --allow-root/' ${plugin_platform_dir}/package.json

yarn osd bootstrap --skip-opensearch-dashboards-plugins
}

Expand All @@ -100,19 +100,19 @@ download_wazuh_app_sources() {
if ! git clone $wazuh_app_clone_repo_url --branch ${wazuh_branch} --depth=1 ${plugin_platform_dir}/plugins/wazuh ; then
echo "Error downloading the source code from wazuh-kibana-app GitHub repository."
exit 1
fi
fi
}


build_package(){

cd $source_dir

# Set pkg name
if [ -z "${app_revision}" ]; then
wazuh_app_pkg_name="wazuh_opensearch_dashboards-${wazuh_version}_${plugin_platform_version}.zip"
wazuh_app_pkg_name="wazuh-${wazuh_version}.zip"
else
wazuh_app_pkg_name="wazuh_opensearch_dashboards-${wazuh_version}_${plugin_platform_version}-${app_revision}.zip"
wazuh_app_pkg_name="wazuh-${wazuh_version}-${app_revision}.zip"
fi

# Build the package
Expand Down

0 comments on commit 350aa4d

Please sign in to comment.