Skip to content

Commit 3ef7b0c

Browse files
authored
Update/pin ubuntu from latest to 24.04 (#524)
* uypdate ubuntu from latest to pinned 24.04 * update ubuntu from latest to pinned 24.04 also in scripts
1 parent d94bb03 commit 3ef7b0c

13 files changed

+19
-19
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
analyze:
1212
name: Analyze
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
permissions:
1515
actions: read
1616
contents: read

.github/workflows/redirect_issues.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
- cron: "0 12 * * *"
66

77
workflow_dispatch: # should be deleted after manual test
8-
8+
99
jobs:
1010
redirect-issues:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212

1313
steps:
1414
- uses: actions/checkout@v4

.github/workflows/release-serverless-init.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434

3535
jobs:
3636
release-serverless-init:
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-24.04
3838
strategy:
3939
matrix:
4040
arrays: [

.github/workflows/retry-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
rerun:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2020
steps:
2121
- name: Rerun ${{ inputs.run_id }}
2222
env:

.github/workflows/rs_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
# If this job fails, you probably need to regenerate the license, e.g.
167167
# CARGO_HOME=/tmp/dd-cargo cargo bundle-licenses --format yaml --output LICENSE-3rdparty.yml
168168
license-3rdparty:
169-
runs-on: ubuntu-latest
169+
runs-on: ubuntu-24.04
170170
name: "Valid LICENSE-3rdparty.yml"
171171
steps:
172172
- name: Checkout sources

.github/workflows/serverless-vuln-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
check:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-24.04
1818
steps:
1919

2020
# scan latest released images
@@ -155,7 +155,7 @@ jobs:
155155
retry:
156156
needs: check
157157
if: failure() && fromJSON(github.run_attempt) < 2
158-
runs-on: ubuntu-latest
158+
runs-on: ubuntu-24.04
159159
permissions:
160160
actions: write
161161
steps:
@@ -168,7 +168,7 @@ jobs:
168168
notify:
169169
needs: check
170170
if: failure() && fromJSON(github.run_attempt) >= 2
171-
runs-on: ubuntu-latest
171+
runs-on: ubuntu-24.04
172172
steps:
173173
- name: Notify
174174
env:

scripts/Dockerfile.alpine.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN /usr/lib/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/datad
4545
(echo "agentVersionDefault variable doesn't exist" && exit 1)
4646

4747
# zip the extension
48-
FROM ubuntu:latest as compresser
48+
FROM ubuntu:24.04 as compresser
4949
ARG CMD_PATH
5050
ARG DATADOG_WRAPPER=datadog_wrapper
5151
RUN apt-get update

scripts/Dockerfile.bottlecap.alpine.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax = docker/dockerfile:experimental
22

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

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

2929
# Zip Extension
30-
FROM ubuntu:latest as compresser
30+
FROM ubuntu:24.04 as compresser
3131
ARG DATADOG_WRAPPER=datadog_wrapper
3232
ARG GO_AGENT_PATH
3333

scripts/Dockerfile.bottlecap.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax = docker/dockerfile:experimental
22

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

77
# 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
2525
RUN cp /tmp/dd/bottlecap/target/$PLATFORM-unknown-linux-gnu/release/bottlecap /tmp/dd/bottlecap/bottlecap
2626

2727
# Zip Extension
28-
FROM ubuntu:latest as compresser
28+
FROM ubuntu:24.04 as compresser
2929
ARG DATADOG_WRAPPER=datadog_wrapper
3030
ARG GO_AGENT_PATH
3131

scripts/Dockerfile.bottlecap.dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax = docker/dockerfile:experimental
22

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

2222
# zip the extension
23-
FROM ubuntu:latest as compresser
23+
FROM ubuntu:24.04 as compresser
2424
ARG DATADOG_WRAPPER=datadog_wrapper
2525

2626
RUN apt-get update

0 commit comments

Comments
 (0)