Skip to content

Cherry-pick #24155 to 7.x: [Elastic Agent] Fix docker entrypoint for elastic-agent.#24161

Merged
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_24155_7.x
Feb 23, 2021
Merged

Cherry-pick #24155 to 7.x: [Elastic Agent] Fix docker entrypoint for elastic-agent.#24161
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_24155_7.x

Conversation

@blakerouse
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse commented Feb 22, 2021 •
edited by zube bot
Loading

Cherry-pick of PR #24155 to 7.x branch. Original message:

What does this PR do?

Fixes issue caused by #23865 where the enrollment command doesn't get parameterized url and enrollment token.

Why is it important?

So enrollment through Docker works.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
8c95220 
* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 22, 2021

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 22, 2021

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 22, 2021
@blakerouse blakerouse self-assigned this Feb 22, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 22, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24161 opened

  • Start Time: 2021-02-22T16:17:23.817+0000

  • Duration: 165 min 24 sec

  • Commit: 8c95220

Test stats 🧪

Test Results
Failed 0
Passed 46577
Skipped 4981
Total 51558

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 46577
Skipped 4981
Total 51558

michalpristas
michalpristas approved these changes Feb 23, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

lgtm

@blakerouse blakerouse merged commit bd0f675 into elastic:7.x Feb 23, 2021
@blakerouse blakerouse deleted the backport_24155_7.x branch February 23, 2021 12:04
@mtojek mtojek mentioned this pull request Feb 24, 2021
Closed
@zube zube bot removed the [zube]: Done label May 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpristas michalpristas michalpristas approved these changes

Assignees

@blakerouse blakerouse

Labels

backport Team:Elastic-Agent Label for the Agent team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@blakerouse @elasticmachine @michalpristas