Skip to content

Fix elastic-agent-service Docker container entrypoint #5892

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

Merged
cmacknz merged 4 commits into from
Oct 30, 2024
Merged

Fix elastic-agent-service Docker container entrypoint #5892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be6ad47
Stop treating the service image like cloud.
cmacknz Oct 30, 2024
52d261f
Remove elastic-agent-service command customization.
cmacknz Oct 30, 2024
d316c56
Remove unnecessary 'or'
cmacknz Oct 30, 2024
f912683
Merge branch 'main' into fix-elastic-agent-service-container-entrypoint
cmacknz Oct 30, 2024
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
6 changes: 3 additions & 3 deletions 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 @@ -42,7 +42,7 @@ RUN true && \
chmod 0775 {{ $beatHome}}/{{ $modulesd }} && \
{{- end }}

{{- if or (eq .Variant "cloud") (eq .Variant "service") }}
{{- if eq .Variant "cloud" }}
mkdir -p /opt/agentbeat /opt/filebeat /opt/metricbeat && \
cp -f {{ $beatHome }}/data/cloud_downloads/filebeat.sh /opt/filebeat/filebeat && \
chmod +x /opt/filebeat/filebeat && \
Expand Down Expand Up @@ -172,7 +172,7 @@ RUN mkdir /licenses
COPY --from=home {{ $beatHome }}/LICENSE.txt /licenses
COPY --from=home {{ $beatHome }}/NOTICE.txt /licenses

{{- if or (eq .Variant "cloud") (eq .Variant "service") }}
{{- if eq .Variant "cloud" }}
COPY --from=home /opt /opt
# Generate folder for a stub command that will be overwritten at runtime
RUN mkdir /app && \
Expand Down Expand Up @@ -294,7 +294,7 @@ ENV LIBBEAT_MONITORING_CGROUPS_HIERARCHY_OVERRIDE=/

WORKDIR {{ $beatHome }}

{{- if or (eq .Variant "cloud") (eq .Variant "service") }}
{{- if eq .Variant "cloud" }}
ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/app/apm.sh"]
# Generate a stub command that will be overwritten at runtime
Expand Down
5 changes: 0 additions & 5 deletions testing/integration/kubernetes_agent_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@ func TestKubernetesAgentService(t *testing.T) {
container.Env[idx].ValueFrom = nil
}
}

// has a unique entrypoint and command because its ran in the cloud
// adjust the spec to run it correctly
container.Command = []string{"elastic-agent"}
container.Args = []string{"-c", "/etc/elastic-agent/agent.yml", "-e"}
},
func(pod *corev1.PodSpec) {
for volumeIdx, volume := range pod.Volumes {
Expand Down