Skip to content

Commit b0e78ee

Browse files
committed
update CNI plugins (1.6.2)
Signed-off-by: Jin Dong <[email protected]>
1 parent e6132a7 commit b0e78ee

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

Dockerfile

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Basic deps
2121
ARG CONTAINERD_VERSION=v2.0.1
2222
ARG RUNC_VERSION=v1.2.3
23-
ARG CNI_PLUGINS_VERSION=v1.6.1
23+
ARG CNI_PLUGINS_VERSION=v1.6.2
2424

2525
# Extra deps: Build
2626
ARG BUILDKIT_VERSION=v0.18.2
@@ -57,18 +57,18 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debia
5757
COPY --from=xx / /
5858
ENV DEBIAN_FRONTEND=noninteractive
5959
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
60-
git \
61-
dpkg-dev
60+
git \
61+
dpkg-dev
6262
ARG TARGETARCH
6363
# libbtrfs: for containerd
6464
# libseccomp: for runc and bypass4netns
6565
RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \
66-
binutils \
67-
gcc \
68-
libc6-dev \
69-
libbtrfs-dev \
70-
libseccomp-dev \
71-
pkg-config
66+
binutils \
67+
gcc \
68+
libc6-dev \
69+
libbtrfs-dev \
70+
libseccomp-dev \
71+
pkg-config
7272
RUN git config --global advice.detachedHead false
7373

7474
FROM build-base-debian AS build-containerd
@@ -246,12 +246,12 @@ COPY --from=build-full /out /
246246
FROM ubuntu:${UBUNTU_VERSION} AS base
247247
# fuse3 is required by stargz snapshotter
248248
RUN apt-get update -qq && apt-get install -qq -y --no-install-recommends \
249-
apparmor \
250-
bash-completion \
251-
ca-certificates curl \
252-
iproute2 iptables \
253-
dbus dbus-user-session systemd systemd-sysv \
254-
fuse3
249+
apparmor \
250+
bash-completion \
251+
ca-certificates curl \
252+
iproute2 iptables \
253+
dbus dbus-user-session systemd systemd-sysv \
254+
fuse3
255255
ARG CONTAINERIZED_SYSTEMD_VERSION
256256
RUN curl -o /docker-entrypoint.sh -fsSL --proto '=https' --tlsv1.2 https://raw.githubusercontent.com/AkihiroSuda/containerized-systemd/${CONTAINERIZED_SYSTEMD_VERSION}/docker-entrypoint.sh && \
257257
chmod +x /docker-entrypoint.sh
@@ -278,9 +278,9 @@ FROM base AS test-integration
278278
ARG DEBIAN_FRONTEND=noninteractive
279279
# `expect` package contains `unbuffer(1)`, which is used for emulating TTY for testing
280280
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
281-
expect \
282-
git \
283-
make
281+
expect \
282+
git \
283+
make
284284
COPY --from=goversion /GOVERSION /GOVERSION
285285
ARG TARGETARCH
286286
RUN curl -fsSL --proto '=https' --tlsv1.2 https://golang.org/dl/$(cat /GOVERSION).linux-${TARGETARCH:-amd64}.tar.gz | tar xzvC /usr/local
@@ -325,9 +325,9 @@ FROM test-integration AS test-integration-rootless
325325
# (`sudo` does not work for this purpose,
326326
# OTOH `machinectl shell` can create the session but does not propagate exit code)
327327
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
328-
uidmap \
329-
openssh-server \
330-
openssh-client
328+
uidmap \
329+
openssh-server \
330+
openssh-client
331331
# TODO: update containerized-systemd to enable sshd by default, or allow `systemctl wants <TARGET> ssh` here
332332
RUN ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N '' && \
333333
useradd -m -s /bin/bash rootless && \
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 cni-plugins-linux-amd64-v1.6.2.tgz
2+
01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4 cni-plugins-linux-arm64-v1.6.2.tgz

0 commit comments

Comments
 (0)