diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 862bc927f..56e6a47c3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,7 +10,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/redirect_issues.yml b/.github/workflows/redirect_issues.yml index 03b1974a6..9bc72c9e1 100644 --- a/.github/workflows/redirect_issues.yml +++ b/.github/workflows/redirect_issues.yml @@ -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 diff --git a/.github/workflows/release-serverless-init.yml b/.github/workflows/release-serverless-init.yml index 28cacbd7a..e677553be 100644 --- a/.github/workflows/release-serverless-init.yml +++ b/.github/workflows/release-serverless-init.yml @@ -34,7 +34,7 @@ env: jobs: release-serverless-init: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: arrays: [ diff --git a/.github/workflows/retry-workflow.yml b/.github/workflows/retry-workflow.yml index ca5420918..2fe317135 100644 --- a/.github/workflows/retry-workflow.yml +++ b/.github/workflows/retry-workflow.yml @@ -16,7 +16,7 @@ on: jobs: rerun: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Rerun ${{ inputs.run_id }} env: diff --git a/.github/workflows/rs_ci.yml b/.github/workflows/rs_ci.yml index a37eba5a9..5f52a22b9 100644 --- a/.github/workflows/rs_ci.yml +++ b/.github/workflows/rs_ci.yml @@ -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 diff --git a/.github/workflows/serverless-vuln-scan.yml b/.github/workflows/serverless-vuln-scan.yml index 013b08710..9696374f1 100644 --- a/.github/workflows/serverless-vuln-scan.yml +++ b/.github/workflows/serverless-vuln-scan.yml @@ -14,7 +14,7 @@ env: jobs: check: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: # scan latest released images @@ -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: @@ -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: diff --git a/scripts/Dockerfile.alpine.build b/scripts/Dockerfile.alpine.build index 0eaf72577..68481386e 100644 --- a/scripts/Dockerfile.alpine.build +++ b/scripts/Dockerfile.alpine.build @@ -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 diff --git a/scripts/Dockerfile.bottlecap.alpine.build b/scripts/Dockerfile.bottlecap.alpine.build index 0f303b3c1..0a5a73c38 100644 --- a/scripts/Dockerfile.bottlecap.alpine.build +++ b/scripts/Dockerfile.bottlecap.alpine.build @@ -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"] @@ -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 diff --git a/scripts/Dockerfile.bottlecap.build b/scripts/Dockerfile.bottlecap.build index 86c2f983d..e7659fed0 100644 --- a/scripts/Dockerfile.bottlecap.build +++ b/scripts/Dockerfile.bottlecap.build @@ -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. @@ -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 diff --git a/scripts/Dockerfile.bottlecap.dev b/scripts/Dockerfile.bottlecap.dev index 4dcf57b74..62543a40b 100644 --- a/scripts/Dockerfile.bottlecap.dev +++ b/scripts/Dockerfile.bottlecap.dev @@ -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 / @@ -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 diff --git a/scripts/Dockerfile.build b/scripts/Dockerfile.build index a5127b99f..2b400f389 100644 --- a/scripts/Dockerfile.build +++ b/scripts/Dockerfile.build @@ -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 diff --git a/scripts/Dockerfile.race.build b/scripts/Dockerfile.race.build index e3e186238..ec8c0db70 100644 --- a/scripts/Dockerfile.race.build +++ b/scripts/Dockerfile.race.build @@ -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 diff --git a/scripts_v2/Dockerfile.build b/scripts_v2/Dockerfile.build index 30b3291ab..c2c898538 100644 --- a/scripts_v2/Dockerfile.build +++ b/scripts_v2/Dockerfile.build @@ -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