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

Jump to bottom

Use private beta release for OTel Agent Custom Components workflow #29556

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Use private beta release for OTel Agent Custom Components workflow #29556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e1fee
Update BYOC dockerfile with beta release
dineshg13 Sep 24, 2024
84479ed
Merge remote-tracking branch 'origin/main' into dinesh.gurumurthy/OTE…
dineshg13 Sep 24, 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
8 changes: 5 additions & 3 deletions Dockerfiles/agent-ot/Dockerfile.agent-otel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
ARG AGENT_VERSION=nightly-ot-beta-main-jmx
ARG AGENT_VERSION=7.57.0-v1.0-ot-beta-jmx
ARG AGENT_BRANCH=7.57.x-otel-beta-v1
# Use the Ubuntu Slim AMD64 base image
FROM ubuntu:24.04 AS builder

# Set environment variables
ARG AGENT_VERSION
ARG AGENT_BRANCH
ENV DEBIAN_FRONTEND=noninteractive

# Set the working directory
Expand All @@ -24,7 +26,7 @@ RUN apt-get update && \
&& rm -rf /var/lib/apt/lists/*

# TEMP: Use github source code
RUN git clone --depth 1 https://github.com/DataDog/datadog-agent.git datadog-agent-${AGENT_VERSION}
RUN git clone --depth 1 -b "${AGENT_BRANCH}" --single-branch https://github.com/DataDog/datadog-agent.git datadog-agent-${AGENT_VERSION}

# Once we have stable releases, we can use the following code to download the source code
# TODO: use released agent version once we have an agent release with the otel binary
Expand Down Expand Up @@ -77,7 +79,7 @@ RUN . venv/bin/activate && invoke collector.generate
RUN . venv/bin/activate && invoke otel-agent.build

# Use the final Datadog agent image
FROM datadog/agent-dev:${AGENT_VERSION}
FROM datadog/agent:${AGENT_VERSION}
ARG AGENT_VERSION
# Copy the built OTel agent from the builder stage
COPY --from=builder /workspace/datadog-agent-${AGENT_VERSION}/bin/otel-agent/otel-agent /opt/datadog-agent/embedded/bin/otel-agent
Expand Down
Loading