Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #18408 to 7.x: Fix jq: command not found #18416

Merged
merged 1 commit into from
May 11, 2020

Conversation

michalpristas
Copy link
Contributor

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

What does this PR do?

Fixes jq command not found issue with generated dockerfile by splitting installation in two steps.

Why is it important?

to have jq present so entrypoint script is able to parse fleet responses

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.

How to test it

build Dockerfiles out of templates using

cd x-pack/elastic-agent
PLATFORMS=`+all linux/amd64 mage package

you will find it inside x-pack/elastic-agent/build/package/elastic-agent/elastic-agent-linux-amd64.docker/docker-build

from ^^ directory build docker image and run it

docker build -t agent .
docker run -it --entrypoint /bin/bash agent

verify that jq is present

Fixes: #18406

* install jq in separate steps

* changelog

* move up

* comment

* embarrasing commit

* tidy

* Update dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
@michalpristas michalpristas added bug backport elastic-agent Ingest Management:alpha1 Group issues for ingest management alpha1 labels May 11, 2020
@michalpristas michalpristas self-assigned this May 11, 2020
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 11, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 11, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 5882
Skipped 899
Total 6781

@michalpristas michalpristas merged commit 44b903f into elastic:7.x May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bug Ingest Management:alpha1 Group issues for ingest management alpha1 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants