Skip to content

Commit 9a992e9

Browse files
committed
Provides: containerd (= 1.7.5) so deb dependencies like it
1 parent acc4a0e commit 9a992e9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Diff for: Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN make
3737
FROM build as containerd
3838
WORKDIR /src
3939
ARG CONTAINERD_VERSION="v1.7.5"
40+
# When changing above, also change the version in the debian/control file
4041
RUN git -c advice.detachedHead=false clone --depth=1 --single-branch --branch=${CONTAINERD_VERSION} https://github.com/containerd/containerd /src/containerd
4142
WORKDIR /src/containerd
4243
RUN BUILDTAGS=no_btrfs make

Diff for: build-docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
set -e
33

44
rm -rf ./out
5-
#docker buildx build --progress=plain --platform=linux/amd64 --pull --build-arg BASE_IMAGE=ubuntu:jammy --build-arg OS_ARCH=amd64 -t containerd:amd64 .
5+
docker buildx build --progress=plain --platform=linux/amd64 --pull --build-arg BASE_IMAGE=ubuntu:jammy --build-arg OS_ARCH=amd64 -t containerd:amd64 .
66
#docker buildx build --progress=plain --platform=linux/amd64 --pull --build-arg BASE_IMAGE=debian:bullseye --build-arg OS_ARCH=amd64 -t containerd:amd64 .
7-
docker buildx build --progress=plain --platform=linux/amd64 --pull --build-arg BASE_IMAGE=debian:trixie --build-arg OS_ARCH=amd64 -t containerd:amd64 .
7+
#docker buildx build --progress=plain --platform=linux/amd64 --pull --build-arg BASE_IMAGE=debian:trixie --build-arg OS_ARCH=amd64 -t containerd:amd64 .
88
docker cp $(docker create --rm containerd:amd64):/out ./
99
ls -lah ./out/

Diff for: debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Standards-Version: 3.9.6
77
Homepage: https://containerd.io/
88

99
Package: k8s-worker-containerd
10-
Provides: golang-cfssl, containerd, runc, podman, conman, golang-github-containers-image, golang-github-containers-common, cri-tools
10+
Provides: golang-cfssl, containerd (= 1.7.5), runc, podman, conman, golang-github-containers-image, golang-github-containers-common, cri-tools
1111
Conflicts: golang-cfssl, containerd, runc, podman, conman
1212
Description: containerd/run/cri-tools/podman/conman for k8s
1313
containerd/run/cri-tools/podman/conman

0 commit comments

Comments
 (0)