Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: read
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/redirect_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
- cron: "0 12 * * *"

workflow_dispatch: # should be deleted after manual test

jobs:
redirect-issues:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-serverless-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:

jobs:
release-serverless-init:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
matrix:
arrays: [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/retry-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
rerun:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Rerun ${{ inputs.run_id }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rs_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
# If this job fails, you probably need to regenerate the license, e.g.
# CARGO_HOME=/tmp/dd-cargo cargo bundle-licenses --format yaml --output LICENSE-3rdparty.yml
license-3rdparty:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: "Valid LICENSE-3rdparty.yml"
steps:
- name: Checkout sources
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/serverless-vuln-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
check:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:

# scan latest released images
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
retry:
needs: check
if: failure() && fromJSON(github.run_attempt) < 2
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: write
steps:
Expand All @@ -168,7 +168,7 @@ jobs:
notify:
needs: check
if: failure() && fromJSON(github.run_attempt) >= 2
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Notify
env:
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.alpine.build
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN /usr/lib/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/datad
(echo "agentVersionDefault variable doesn't exist" && exit 1)

# zip the extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG CMD_PATH
ARG DATADOG_WRAPPER=datadog_wrapper
RUN apt-get update
Expand Down
4 changes: 2 additions & 2 deletions scripts/Dockerfile.bottlecap.alpine.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:experimental

FROM alpine:3.16 as bottlecap-builder
ARG PLATFORM
ARG PLATFORM
RUN apk add --no-cache curl gcc musl-dev make unzip bash autoconf automake libtool g++

SHELL ["/bin/bash", "-c"]
Expand All @@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cargo/registry cargo +stable build --releas
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-musl/release/bottlecap /tmp/dd/bottlecap/bottlecap

# Zip Extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG DATADOG_WRAPPER=datadog_wrapper
ARG GO_AGENT_PATH

Expand Down
4 changes: 2 additions & 2 deletions scripts/Dockerfile.bottlecap.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:experimental

FROM public.ecr.aws/lambda/provided:al2 as bottlecap-builder
ARG PLATFORM
ARG PLATFORM
RUN yum install -y curl gcc gcc-c++ make unzip

# Install Protocol Buffers compiler by hand, since AL2 does not have a recent enough version.
Expand All @@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +stable build --re
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap

# Zip Extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG DATADOG_WRAPPER=datadog_wrapper
ARG GO_AGENT_PATH

Expand Down
4 changes: 2 additions & 2 deletions scripts/Dockerfile.bottlecap.dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:experimental

FROM public.ecr.aws/lambda/provided:al2 as bottlecap-builder
ARG PLATFORM
ARG PLATFORM
RUN yum install -y curl gcc gcc-c++ make unzip openssl openssl-devel
# Install Protocol Buffers compiler by hand, since AL2 does not have a recent enough version.
COPY ./scripts/install-protoc.sh /
Expand All @@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry cargo +stable build --re
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap

# zip the extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG DATADOG_WRAPPER=datadog_wrapper

RUN apt-get update
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN /usr/local/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/dat
(echo "agentVersionDefault variable doesn't exist" && exit 1)

# zip the extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG CMD_PATH
ARG DATADOG_WRAPPER=datadog_wrapper

Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.race.build
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN go tool nm datadog-agent | grep -w 'github.com/DataDog/datadog-agent/pkg/ver
(echo "agentVersionDefault variable doesn't exist" && exit 1)

# zip the extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
RUN apt-get update
RUN apt-get install -y zip
RUN mkdir /extensions
Expand Down
2 changes: 1 addition & 1 deletion scripts_v2/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN /usr/local/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/dat
(echo "agentVersionDefault variable doesn't exist" && exit 1)

# zip the extension
FROM ubuntu:latest as compresser
FROM ubuntu:24.04 as compresser
ARG CMD_PATH
ARG DATADOG_WRAPPER=datadog_wrapper

Expand Down
Loading