Skip to content

Commit 61f0532

Browse files
committed
Merge branch 'alpeb/bump-dev' into alpeb/cni-plugin-integration-fixup
2 parents 67e0c5d + 0a94251 commit 61f0532

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linkerd2",
3-
"image": "ghcr.io/linkerd/dev:v44",
3+
"image": "ghcr.io/linkerd/dev:v45",
44
"extensions": [
55
"DavidAnson.vscode-markdownlint",
66
"golang.go",

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ permissions:
1414
jobs:
1515
lint:
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/linkerd/dev:v44-go
17+
container: ghcr.io/linkerd/dev:v45-go
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
2121
- run: just go-lint --verbose --timeout=10m
2222

2323
fmt:
2424
runs-on: ubuntu-latest
25-
container: ghcr.io/linkerd/dev:v44-go
25+
container: ghcr.io/linkerd/dev:v45-go
2626
steps:
2727
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2828
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
2929
- run: just go-fmt-check
3030

3131
unit-test:
3232
runs-on: ubuntu-latest
33-
container: ghcr.io/linkerd/dev:v44-go
33+
container: ghcr.io/linkerd/dev:v45-go
3434
steps:
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3636
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033

.github/workflows/release-validator.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
meta:
1515
timeout-minutes: 15
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/linkerd/dev:v44-rust
17+
container: ghcr.io/linkerd/dev:v45-rust
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020
- uses: ./.github/actions/version-mode
@@ -34,7 +34,7 @@ jobs:
3434
arch: [amd64, arm64, arm]
3535
timeout-minutes: 10
3636
runs-on: ubuntu-latest
37-
container: ghcr.io/linkerd/dev:v44-rust-musl
37+
container: ghcr.io/linkerd/dev:v45-rust-musl
3838
steps:
3939
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
4040
- run: just validator arch=${{ matrix.arch }} profile=release version=${{ needs.meta.outputs.version }} package

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
check:
1515
timeout-minutes: 5
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/linkerd/dev:v44-rust
17+
container: ghcr.io/linkerd/dev:v45-rust
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2020
- run: just rs-fetch

Dockerfile-cni-plugin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG TARGETARCH
1212
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \
1313
go build -o /go/bin/linkerd-cni -mod=readonly -ldflags "-s -w" -v ./cni-plugin/
1414

15-
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v44-rust-musl as cni-repair-controller
15+
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v45-rust-musl as cni-repair-controller
1616
WORKDIR /build
1717
COPY --link justfile justfile-rust .
1818
COPY --link Cargo.toml Cargo.lock .

0 commit comments

Comments
 (0)