Skip to content

Fix Docker image build process#289

Merged
mihirsoni merged 4 commits intoopensearch-project:mainfrom
jgough:main
Apr 15, 2021
Merged

Fix Docker image build process#289
mihirsoni merged 4 commits intoopensearch-project:mainfrom
jgough:main

Conversation

@jgough
Copy link
Copy Markdown
Contributor

@jgough jgough commented Apr 14, 2021

Description

This fixes the Docker image building process that was still trying to build kibana

Issues Resolved

#285

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

jgough added 3 commits April 14, 2021 09:24
The Dockerfile was still building kibana so updated to build OpenSearch-Dashboards.
Some fields in the Docker image labels may need updating but setting to some fairly sensible values for now.
Additionally some future work to be done around public artefacts that AFAIK don't exist yet.
Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>
This needs eventually updating to a correct URI but for now this should suffice
Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>
Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>
@odfe-release-bot
Copy link
Copy Markdown

✅   DCO Check Passed f846f33

kavilla
kavilla previously approved these changes Apr 14, 2021
Copy link
Copy Markdown
Member

@kavilla kavilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Pulled it down and was able to build docker containers. Thank you!

RUN cd /opt && \
curl --retry 8 -s -L -O https://artifacts.opensearch.co/downloads/kibana/{{artifactTarball}} && \
cd -
# TODO: Update this link or remove functionality
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need to do for this PR but for these I end up appended [RENAMEME] to the TODO's so that we can track it a little bit easier. So we will end up updating all these artifact links with real links.

@kavilla kavilla linked an issue Apr 14, 2021 that may be closed by this pull request
Comment thread src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile Outdated
Comment thread src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile Outdated
Copy link
Copy Markdown
Contributor

@mihirsoni mihirsoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jgough Thank you for the PR and changes, few minor comments, otherwise looks good. Where Kibana is references in terms of string use OpenSearch Dashboards instead of OpenSearch-Dashboards

@odfe-release-bot
Copy link
Copy Markdown

❌   DCO Check Failed 68d71e4
Run ./dev-tools/signoff-check.sh remotes/origin/main 68d71e410e075ae0ab3f13cd47623aa8595f58a4 to check locally
Use git commit with -s to add 'Signed-of-by: {EMAIL}' on impacted commits

Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>
@odfe-release-bot
Copy link
Copy Markdown

✅   DCO Check Passed 26b2b17

Copy link
Copy Markdown
Contributor

@mihirsoni mihirsoni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !! Thanks for the changes @jgough

I'l wait for @kavilla approval and then merge.

Copy link
Copy Markdown
Member

@kavilla kavilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mihirsoni mihirsoni merged commit e03f7bd into opensearch-project:main Apr 15, 2021
kavilla pushed a commit that referenced this pull request May 21, 2021
* Fix Dockerfile to build OpenSearch-Dashboards

The Dockerfile was still building kibana so updated to build OpenSearch-Dashboards.
Some fields in the Docker image labels may need updating but setting to some fairly sensible values for now.
Additionally some future work to be done around public artefacts that AFAIK don't exist yet.
Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>

* Change docker image host to opensearch.org

This needs eventually updating to a correct URI but for now this should suffice
Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>

* Removing x-pack code

Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>

* Update name to OpenSearch Dashboards

Signed-off-by: Jonathan Gough <jonathanpgough@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Errors building docker container

4 participants