Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

app-emulation/containerd: add containerd-runc-shim-v*#623

Merged
dongsupark merged 1 commit intomainfrom
dongsu/containerd-shim-runc
Oct 7, 2020
Merged

app-emulation/containerd: add containerd-runc-shim-v*#623
dongsupark merged 1 commit intomainfrom
dongsu/containerd-shim-runc

Conversation

@dongsupark
Copy link
Copy Markdown
Contributor

@dongsupark dongsupark commented Sep 30, 2020

Add new binaries containerd-runc-shim-v[12] to the torcx tarballs for docker and containerd.
The binaries are necessary for kubelet to communicate via custom CRI endpoints.

The addition will cause usage of the /usr partition to grow by ~5M.

$ ls -l /run/torcx/unpack/docker/bin
-rwxr-xr-x. 1 root root  6742592 Sep 30 13:22 containerd-shim
-rwxr-xr-x. 1 root root  9095176 Sep 30 13:22 containerd-shim-runc-v1
-rwxr-xr-x. 1 root root  9111752 Sep 30 13:22 containerd-shim-runc-v2

$ ls -l /usr/share/torcx/store/docker\:19.03.torcx.tgz
-rw-r--r--. 1 root root 89809888 Sep 30 14:16 /usr/share/torcx/store/docker:19.03.torcx.tgz

$ df /usr
Filesystem      1K-blocks   Used Available Use% Mounted on
/dev/mapper/usr   1007760 916024     39720  96% /usr

Note, we do not touch other torcx profiles like docker 1.12 or 17.03, to keep the image size as small as possible.

Testing done

CI passed

Add new binaries containerd-runc-shim-v[12] to the torcx tarballs for
docker and containerd. The binaries are necessary for kubelet to
communicate via custom CRI endpoints.

The addition will cause usage of the /usr partition to grow by ~5M.

```
$ ls -l /run/torcx/unpack/docker/bin
-rwxr-xr-x. 1 root root  6742592 Sep 30 13:22 containerd-shim
-rwxr-xr-x. 1 root root  9095176 Sep 30 13:22 containerd-shim-runc-v1
-rwxr-xr-x. 1 root root  9111752 Sep 30 13:22 containerd-shim-runc-v2

$ ls -l /usr/share/torcx/store/docker\:19.03.torcx.tgz
-rw-r--r--. 1 root root 89809888 Sep 30 14:16 /usr/share/torcx/store/docker:19.03.torcx.tgz

$ df /usr
Filesystem      1K-blocks   Used Available Use% Mounted on
/dev/mapper/usr   1007760 916024     39720  96% /usr
```

Note, we do not touch other torcx profiles like docker 1.12 or 17.03,
to keep the image size as small as possible.
@dongsupark
Copy link
Copy Markdown
Contributor Author

CI passed

Copy link
Copy Markdown
Contributor

@krnowak krnowak left a comment

Choose a reason for hiding this comment

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

Looks good.

@dongsupark dongsupark changed the title [WIP] app-emulation/containerd: add containerd-runc-shim-v* app-emulation/containerd: add containerd-runc-shim-v* Oct 2, 2020
@dongsupark dongsupark marked this pull request as ready for review October 2, 2020 12:44
@dongsupark dongsupark requested a review from a team October 2, 2020 12:44
@dongsupark dongsupark merged commit e7b0f43 into main Oct 7, 2020
@dongsupark dongsupark deleted the dongsu/containerd-shim-runc branch October 7, 2020 08:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants