Skip to content

package/catatonit: update, and use as init or docker init (branch yem/docker-init)

Yann E. MORIN buildroot 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4package/docker-engine: carry the tini init symlinkpackage/docker-engine/docker-engine.mk package/tini/tini.mk+8 -22 replies
2/4package/docker-engine: add option to support catatonit as initConfig.in.legacy package/docker-engine/Config.in package/docker-engine/docker-engine.mk+40 -71 reply
3/4package/catatonit: update to version 0.2.1package/catatonit/0001-fix-build-with-kernel-5.9.patch package/catatonit/catatonit.hash package/catatonit/catatonit.mk+2 -511 reply
4/4system: add catatonit as init systemsystem/Config.in+10 -00 replies

Reviews trailers per patch

None of the 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchChristian StewartFiona Klute (WIWA)
SeriesR-b
1/4T-b
2/4T-b
3/4T-b
4/4

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Buildroot] [PATCH 0/4] package/catatonit: update, and use as init or docker init (branch yem/docker-init)

Hello All!

This samall series brings catatonit to the same level of support as the other init systems, and especially as a docker-engine init system, like tini.

Tested with the following defconfig (based on qemu_x86_64_defconfig):

    BR2_x86_64=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_GLOBAL_PATCH_DIR="board/qemu/patches"
    BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
    BR2_PER_PACKAGE_DIRECTORIES=y
    BR2_SYSTEM_DHCP="eth0"
    BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh"
    BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
    BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
    BR2_LINUX_KERNEL=y
    BR2_LINUX_KERNEL_CUSTOM_VERSION=y
    BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.9"
    BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
    BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config"
    BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
    BR2_PACKAGE_CA_CERTIFICATES=y
    BR2_PACKAGE_DOCKER_CLI=y
    BR2_PACKAGE_DOCKER_ENGINE=y
    BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT=y
    BR2_TARGET_ROOTFS_EXT2=y
    BR2_TARGET_ROOTFS_EXT2_SIZE="252M"
    BR2_TARGET_ROOTFS_EXT2_RESBLKS=1
    BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS=""
    # BR2_TARGET_ROOTFS_TAR is not set
    BR2_PACKAGE_HOST_GO_BIN=y

And then, in the VM, after login:

    # ls -l /usr/libexec/docker/
    lrwxrwxrwx    1 root     root            19 Feb 15 09:34 docker-init -> ../../bin/catatonit
    # docker container run -ti --init busybox:latest
    [...]
    / # ps
    PID   USER     TIME  COMMAND
        1 root      0:00 /sbin/docker-init -- sh
        6 root      0:00 sh
        7 root      0:00 ps
    / # ls -l /proc/1/exe
    lrwxrwxrwx    1 root     root             0 Feb 15 09:35 /proc/1/exe -> /sbin/docker-init

Replacing BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_CATATONIT=y with BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT_TINI=y still works as previously, with the init symlink being to tini instead of catatonit.

Regards,
Yann E. MORIN.

----------------------------------------------------------------
Yann E. MORIN (4):
package/docker-engine: carry the tini init symlink package/docker-engine: add option to support catatonit as init package/catatonit: update to version 0.2.1
system: add catatonit as init system

 Config.in.legacy                                   |  9 ++++
 .../catatonit/0001-fix-build-with-kernel-5.9.patch | 49 ----------------------
 package/catatonit/catatonit.hash                   |  2 +-
 package/catatonit/catatonit.mk                     |  2 +-
 package/docker-engine/Config.in                    | 32 +++++++++++---
 package/docker-engine/docker-engine.mk             | 10 +++++
 package/tini/tini.mk                               |  2 -
 system/Config.in                                   | 10 +++++
 8 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 package/catatonit/0001-fix-build-with-kernel-5.9.patch

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot