diff --git a/opensearch-dashboards-2.yaml b/opensearch-dashboards-2.yaml index 22ebfe26c55..bfa12100d28 100644 --- a/opensearch-dashboards-2.yaml +++ b/opensearch-dashboards-2.yaml @@ -1,7 +1,7 @@ package: name: opensearch-dashboards-2 version: 2.11.1 - epoch: 1 + epoch: 2 description: Open source visualization dashboards for OpenSearch copyright: - license: Apache-2.0 @@ -75,14 +75,26 @@ pipeline: mkdir -p "${{targets.destdir}}/usr/share" cp -r build/opensearch-dashboards-${{package.version}}-linux-* "${{targets.destdir}}/usr/share/opensearch-dashboards" + # Remove the default config file, as it will be provided by the config package which comes from a different repository. + rm -r ${{targets.destdir}}/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml + - uses: strip subpackages: - - name: ${{package.name}}-compat + - name: ${{package.name}}-config description: Compatibility package to place Docker startup scripts. pipeline: + - uses: git-checkout + with: + repository: https://github.com/opensearch-project/opensearch-build + tag: ${{package.version}} + destination: opensearch-build + expected-commit: dce080075c219010371c02e699e816dd4df7758f # will need to be manually updated when opensearch dashboard auto update happens - runs: | - install -Dm755 src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker "${{targets.contextdir}}/usr/local/bin/opensearch-dashboards-docker" + install -Dm755 opensearch-build/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh ${{targets.contextdir}}/usr/share/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh + install -Dm666 opensearch-build/config/opensearch_dashboards-2.x.yml ${{targets.contextdir}}/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml + install -Dm666 opensearch-build/docker/release/config/opensearch-dashboards/opensearch.example.org.key ${{targets.contextdir}}/usr/share/opensearch-dashboards/config/opensearch.example.org.key + install -Dm666 opensearch-build/docker/release/config/opensearch-dashboards/opensearch.example.org.cert ${{targets.contextdir}}/usr/share/opensearch-dashboards/config/opensearch.example.org.cert - range: plugins name: ${{package.name}}-${{range.key}} @@ -122,6 +134,7 @@ test: contents: packages: - busybox + - ${{package.name}}-config environment: OSD_NODE_HOME: /usr pipeline: