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.

Sign up for GitHub

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

Switch to new containerd version - v1.7.11 #3475

Closed
wants to merge 1 commit into from
Closed

Switch to new containerd version - v1.7.11 #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/Makefile.common.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ TAG?=$(shell echo "$$(date +v%Y%m%d)-$$(git describe --always --dirty)")
IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG)$(TAG_SUFFIX)
# Go version to use, respected by images that build go binaries
GO_VERSION=$(shell cat $(CURDIR)/../../.go-version | head -n1)
CONTAINERD_VERSION?=v1.7.11

# required to enable buildx
export DOCKER_CLI_EXPERIMENTAL=enabled
Expand All @@ -36,7 +37,7 @@ OUTPUT?=
PROGRESS=auto
EXTRA_BUILD_OPT?=
build: ensure-buildx
docker buildx build $(if $(PLATFORMS),--platform=$(PLATFORMS),) $(OUTPUT) --progress=$(PROGRESS) -t ${IMAGE} --pull --build-arg GO_VERSION=$(GO_VERSION) $(EXTRA_BUILD_OPT) .
docker buildx build $(if $(PLATFORMS),--platform=$(PLATFORMS),) $(OUTPUT) --progress=$(PROGRESS) -t ${IMAGE} --pull --build-arg CONTAINERD_VERSION=$(CONTAINERD_VERSION) --build-arg GO_VERSION=$(GO_VERSION) $(EXTRA_BUILD_OPT) .

# push the cross built image
push: OUTPUT=--push
Expand Down
3 changes: 2 additions & 1 deletion images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,10 @@ RUN eval "$(gimme "${GO_VERSION}")" \


# stage for building containerd
# set by makefile to the desired containerd version
ARG CONTAINERD_VERSION
FROM go-build as build-containerd
ARG TARGETARCH GO_VERSION
ARG CONTAINERD_VERSION="v1.7.5"
Copy link
Member

Choose a reason for hiding this comment

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

this is inconsistent with every other version in the file ..?

Copy link
Member Author

Choose a reason for hiding this comment

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

i was mirroring ARG GO_VERSION in line 113 above.

Copy link
Contributor

Choose a reason for hiding this comment

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

why don't keep the default version here?
Also, what is the benefit, this is more a personal commodity no? I don't imaging now we are going to release multiple images with different containerd versions

Copy link
Member Author

Choose a reason for hiding this comment

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

@aojea this is to test newer versions of containerd in CI :)

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we don't want to release multiple images, we just ship with whatever version is in Makefile instead of in Dockerfile

Copy link
Member

@BenTheElder BenTheElder Jan 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The go version had to be moved out for consistency with the rest of the repo, but the containerd version only exists here.

You can already do EXTRA_BUILD_OPT to pass additional args to the dockerfile (IIRC we even have a note in the README?), and we can already PR updates to the CONTAINERD_VERSION.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ack, was trying to make it more obvious/explicit with this PR. will just try to use EXTRA_BUILD_OPT

ARG CONTAINERD_CLONE_URL="https://github.com/containerd/containerd"
# we don't build with optional snapshotters, we never select any of these
# they're not ideal inside kind anyhow, and we save some disk space
Expand Down
Loading