Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CNI plugins (1.6.2) #3797

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Conversation

djdongjin
Copy link
Member

https://github.com/containernetworking/plugins/releases/tag/v1.6.2

(administrative note: release v1.6.1 was somehow double-created in GitHub; v1.6.2 is identical but fixes the duplication.)

Now 1.6.1 only has s390v artifacts and fails our CI:

https://github.com/containernetworking/plugins/releases/tag/v1.6.1

https://github.com/containerd/nerdctl/actions/runs/12641602765/job/35224329459?pr=3796

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
@djdongjin djdongjin added this to the v2.0.3 milestone Jan 7, 2025
@djdongjin djdongjin merged commit 1b98a5e into containerd:main Jan 7, 2025
30 checks passed
@@ -57,18 +57,18 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debia
COPY --from=xx / /
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
git \
dpkg-dev
git \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah probably editor auto format 🤦, let me change this back (and remove the 1.6.1 as well in the other comment), sry!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AkihiroSuda actually this file has mixed 2-space and 4-space indent. After this all indents are 2-space. Maybe we should keep this format change?

4 spaces:

nerdctl/Dockerfile

Lines 65 to 71 in 1220ce7

RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \
binutils \
gcc \
libc6-dev \
libbtrfs-dev \
libseccomp-dev \
pkg-config

2 spaces:

nerdctl/Dockerfile

Lines 79 to 83 in 1220ce7

RUN git checkout ${CONTAINERD_VERSION} && \
mkdir -p /out /out/$TARGETARCH && \
cp -a containerd.service /out
RUN GO=xx-go make STATIC=1 && \
cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/$TARGETARCH

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either is fine to me.

Probably we should have some linter to enforce either of one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, I will keep this format change for now then for consistency. Let me see if there are some linter that can run in CI.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cni-plugins-v1.6.1 can be removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants