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.

Sign up for GitHub

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

[7.17](backport #30873) [Manual backport][Heartbeat] Unpack beats in elastic-agent docker image #31088

Merged
merged 6 commits into from
Apr 19, 2022
Merged

[7.17](backport #30873) [Manual backport][Heartbeat] Unpack beats in elastic-agent docker image #31088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8aa1eba
Unpack beats in elastic-agent docker image (#30873)
emilioalvap Mar 31, 2022
9c595a2
Merge branch '7.17' into mergify/bp/7.17/pr-30873
mergify[bot] Apr 5, 2022
0838088
Merge branch '7.17' into mergify/bp/7.17/pr-30873
mergify[bot] Apr 5, 2022
049a668
Merge branch '7.17' into mergify/bp/7.17/pr-30873
mergify[bot] Apr 12, 2022
3d825c7
Merge branch '7.17' into mergify/bp/7.17/pr-30873
mergify[bot] Apr 13, 2022
8df2a92
Merge branch '7.17' into mergify/bp/7.17/pr-30873
mergify[bot] Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev-tools/packaging/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ shared:
user: '{{ .BeatName }}'
linux_capabilities: ''
image_name: ''
beats_install_path: "install"
files:
'elastic-agent.yml':
source: 'elastic-agent.docker.yml'
Expand Down
14 changes: 13 additions & 1 deletion dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FROM {{ .from }}
ENV BEAT_SETUID_AS={{ .user }}

{{- if contains .from "ubi-minimal" }}
RUN for iter in {1..10}; do microdnf update -y && microdnf install -y findutils shadow-utils && microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
RUN for iter in {1..10}; do microdnf update -y && microdnf install -y tar gzip findutils shadow-utils && microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && sleep 10; done; (exit $exit_code)
{{- else }}
RUN for iter in {1..10}; do \
apt-get update -y && \
Expand Down Expand Up @@ -161,6 +161,18 @@ RUN useradd -M --uid 1000 --gid 1000 --groups 0 --home {{ $beatHome }} {{ .user
RUN chown {{ .user }} $NODE_PATH
{{- end }}
{{- end }}

# Unpack beats to default install directory
RUN mkdir -p {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }} && \
for beatPath in {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/downloads/*.tar.gz; do \
tar xf $beatPath -C {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }}; \
done && \
chown -R {{ .user }}:{{ .user }} {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }} && \
chown -R root:root {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }}/*/*.yml && \
chmod 0644 {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }}/*/*.yml && \
# heartbeat requires cap_net_raw,cap_setuid to run ICMP checks and change npm user
setcap cap_net_raw,cap_setuid+p {{ $beatHome }}/data/{{.BeatName}}-{{ commit_short }}/{{ .beats_install_path }}/heartbeat-*/heartbeat

USER {{ .user }}

{{- if (and (contains .image_name "-complete") (not (contains .from "ubi-minimal"))) }}
Expand Down