* [Buildroot] [PATCH 1/1] package/tini: move docker-init to /usr/libexec/docker/
@ 2023-10-31 15:50 TIAN Yuanhao
2023-10-31 20:42 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: TIAN Yuanhao @ 2023-10-31 15:50 UTC (permalink / raw)
To: buildroot; +Cc: Christian Stewart
The docker-init is not intended to be a user-facing command, and as such
it is more appropriate for it to be found in /usr/libexec/ than in $PATH.
See:
https://github.com/moby/moby/commit/6caaa8cadc9e4f1e122b7b2bb4451500bbec6086
https://github.com/docker/docker-ce-packaging/commit/5a998af6f53d978810aa6f5b566a484911ff4ca2
Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
---
package/tini/tini.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/tini/tini.mk b/package/tini/tini.mk
index 9da54f8a25..75b6786cfb 100644
--- a/package/tini/tini.mk
+++ b/package/tini/tini.mk
@@ -31,7 +31,8 @@ endef
define TINI_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini
- ln -sf tini $(TARGET_DIR)/usr/bin/docker-init
+ $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/docker
+ ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init
endef
# Tini's CMakeLists.txt is not suitable for Buildroot.
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/tini: move docker-init to /usr/libexec/docker/
2023-10-31 15:50 [Buildroot] [PATCH 1/1] package/tini: move docker-init to /usr/libexec/docker/ TIAN Yuanhao
@ 2023-10-31 20:42 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2023-10-31 20:42 UTC (permalink / raw)
To: TIAN Yuanhao; +Cc: Christian Stewart, buildroot
Yuanhao, All,
On 2023-10-31 15:50 +0000, TIAN Yuanhao spake thusly:
> The docker-init is not intended to be a user-facing command, and as such
> it is more appropriate for it to be found in /usr/libexec/ than in $PATH.
>
> See:
> https://github.com/moby/moby/commit/6caaa8cadc9e4f1e122b7b2bb4451500bbec6086
> https://github.com/docker/docker-ce-packaging/commit/5a998af6f53d978810aa6f5b566a484911ff4ca2
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
> ---
> package/tini/tini.mk | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/tini/tini.mk b/package/tini/tini.mk
> index 9da54f8a25..75b6786cfb 100644
> --- a/package/tini/tini.mk
> +++ b/package/tini/tini.mk
> @@ -31,7 +31,8 @@ endef
>
> define TINI_INSTALL_TARGET_CMDS
> $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini
> - ln -sf tini $(TARGET_DIR)/usr/bin/docker-init
> + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/docker
Although what you did is correct, we usually use plain mkdir -p to
create directories, so I've changed that.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> + ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init
> endef
>
> # Tini's CMakeLists.txt is not suitable for Buildroot.
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-31 20:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-31 15:50 [Buildroot] [PATCH 1/1] package/tini: move docker-init to /usr/libexec/docker/ TIAN Yuanhao
2023-10-31 20:42 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.