Skip to content

[build] Produce Docker target consistent with stack#75621

Merged
tylersmalley merged 2 commits intoelastic:masterfrom
tylersmalley:build-rename-docker
Aug 24, 2020
Merged

[build] Produce Docker target consistent with stack#75621
tylersmalley merged 2 commits intoelastic:masterfrom
tylersmalley:build-rename-docker

Conversation

@tylersmalley
Copy link
Member

@tylersmalley tylersmalley commented Aug 21, 2020

The release manager is currently expecting a Docker image target with the format of kibana-8.0.0-SNAPSHOT-docker-image.tar.gz. If this target is not found, it will re-export the image. Making this change to produce the expected filename will remove any duplicated effort. Additionally, the release manager plans to remove this fallback in the future anyway.


target
├── kibana-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz
├── kibana-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz.sha1.txt
├── kibana-8.0.0-SNAPSHOT-docker-build-context.tar.gz
├── kibana-8.0.0-SNAPSHOT-docker-build-context.tar.gz.sha1.txt
├── kibana-8.0.0-SNAPSHOT-docker-image.tar.gz
├── kibana-8.0.0-SNAPSHOT-docker-image.tar.gz.sha1.txt
├── kibana-8.0.0-SNAPSHOT-linux-aarch64.tar.gz
├── kibana-8.0.0-SNAPSHOT-linux-aarch64.tar.gz.sha1.txt
├── kibana-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
├── kibana-8.0.0-SNAPSHOT-linux-x86_64.tar.gz.sha1.txt
├── kibana-8.0.0-SNAPSHOT-windows-x86_64.zip
├── kibana-8.0.0-SNAPSHOT-windows-x86_64.zip.sha1.txt
├── kibana-ubi8-8.0.0-SNAPSHOT-docker-build-context.tar.gz
├── kibana-ubi8-8.0.0-SNAPSHOT-docker-build-context.tar.gz.sha1.txt
├── kibana-ubi8-8.0.0-SNAPSHOT-docker-image.tar.gz
└── kibana-ubi8-8.0.0-SNAPSHOT-docker-image.tar.gz.sha1.txt

Changes:

  • Change docker target filename from ending in -docker.tar.gz to -docker-image.tar.gz
  • Renamed dockerOutputDir to dockerTargetFilename since it contains the filename, and not the directory as described.

This is not a breaking change since the resulting Docker image target is the same from the release manager.

The release manager is currently expecting a Docker asset image with
the format of `kibana-8.0.0-SNAPSHOT-docker-image.tar.gz`. If this
target is not found, it will re-export the image. Making this change to
produce the expected filename will remove that duplicated effort.
Additionally, the release manager plans to remove this fallback in the
future anyways.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
@tylersmalley tylersmalley marked this pull request as ready for review August 21, 2020 17:19
@tylersmalley tylersmalley requested a review from a team as a code owner August 21, 2020 17:19
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@tylersmalley tylersmalley added the release_note:skip Skip the PR/issue when compiling release notes label Aug 21, 2020
@tylersmalley
Copy link
Member Author

@elastic/kibana-qa a heads up if you're consuming the Kibana Docker images directly and not through Release Manager. This aligns the output of both.

Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM

@tylersmalley
Copy link
Member Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@tylersmalley tylersmalley merged commit 6b90926 into elastic:master Aug 24, 2020
tylersmalley added a commit to tylersmalley/kibana that referenced this pull request Aug 24, 2020
The release manager is currently expecting a Docker asset image with
the format of `kibana-8.0.0-SNAPSHOT-docker-image.tar.gz`. If this
target is not found, it will re-export the image. Making this change to
produce the expected filename will remove that duplicated effort.
Additionally, the release manager plans to remove this fallback in the
future anyways.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
tylersmalley added a commit that referenced this pull request Aug 25, 2020
The release manager is currently expecting a Docker asset image with
the format of `kibana-8.0.0-SNAPSHOT-docker-image.tar.gz`. If this
target is not found, it will re-export the image. Making this change to
produce the expected filename will remove that duplicated effort.
Additionally, the release manager plans to remove this fallback in the
future anyways.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature:Build Packaging release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v7.10.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants