From 1ca3025dbcff974cd7263e2047a8567a49c2c35b Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 25 Sep 2024 12:00:12 +0800 Subject: [PATCH] distros: +chmod u+s /bin/ping; --- distros/src/Dockerfile.apt-ubuntu | 1 + distros/src/Dockerfile.zyp-opensuse | 12 ++++++------ distros/src/oth/Dockerfile._no-busybox | 2 +- distros/src/oth/Dockerfile.opk-openwrt | 3 ++- distros/src/oth/Dockerfile.yum-fedora | 7 ++++--- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/distros/src/Dockerfile.apt-ubuntu b/distros/src/Dockerfile.apt-ubuntu index d7bdb189..b0dcb594 100644 --- a/distros/src/Dockerfile.apt-ubuntu +++ b/distros/src/Dockerfile.apt-ubuntu @@ -55,6 +55,7 @@ path-exclude /usr/share/lintian/*\n\ # dropbear-bin dropbear-run openssh-sftp-server # bash-completion # ex-ubt-2404: netcat +# -rwsr-xr-x 1 root root 73200 Apr 11 2023 /bin/ping* || chmod u+s /bin/ping; RUN \ apt.sh wget ca-certificates \ curl \ diff --git a/distros/src/Dockerfile.zyp-opensuse b/distros/src/Dockerfile.zyp-opensuse index 11ed6ddc..75718abf 100644 --- a/distros/src/Dockerfile.zyp-opensuse +++ b/distros/src/Dockerfile.zyp-opensuse @@ -57,13 +57,15 @@ RUN \ # zypper refresh; # zypper clean && zypper refresh \ +# ping: @iputils RUN \ zyp.sh iproute net-tools \ sudo psmisc sysstat tree tmux lrzsz which wget openssl \ - zip unzip \ + iputils zip unzip \ procps jq \ - lame; - + lame; \ + # 01: chmod u+s /bin/ping #02: sudo setcap cap_net_raw+p /bin/ping #setcap 无指令 + chmod u+s /bin/ping; ##APP################################################ # gpg check failed too? @alma 8.7 @@ -99,9 +101,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ # vim, locale, ping; ubt:iptuils-ping; vim 2.2M; iputils vim \ # dbus-x11: perp> xfce4-session: err #hand run> xfce4-session: ok - dbus-1-x11; \ - # 01: chmod u+s /bin/ping #02: sudo setcap cap_net_raw+p /bin/ping #setcap 无指令 - chmod u+s /bin/ping; + dbus-1-x11; # HEADLESS diff --git a/distros/src/oth/Dockerfile._no-busybox b/distros/src/oth/Dockerfile._no-busybox index ca6f432b..f5f3b388 100644 --- a/distros/src/oth/Dockerfile._no-busybox +++ b/distros/src/oth/Dockerfile._no-busybox @@ -15,7 +15,7 @@ MAINTAINER sam RUN \ wget -O /bin/bash --no-check-certificate https://github.com/robxu9/bash-static/releases/download/5.2.015-1.2.3-2/bash-linux-x86_64; \ - chmod +x /bin/bash; exit 0 + chmod +x /bin/bash; chmod u+s /bin/ping; exit 0 # TODO bash-static # https://github.com/luciusmagn/tar-static # https://github.com/robxu9/bash-static diff --git a/distros/src/oth/Dockerfile.opk-openwrt b/distros/src/oth/Dockerfile.opk-openwrt index 66b230a2..acaf1015 100644 --- a/distros/src/oth/Dockerfile.opk-openwrt +++ b/distros/src/oth/Dockerfile.opk-openwrt @@ -35,7 +35,8 @@ RUN \ sed grep gawk findutils sudo tree unzip htop \ shadow bash coreutils \ \ - lftp jq sysstat lame + lftp jq sysstat lame; \ + chmod u+s /bin/ping; # HEADLESS COPY --from=rootfs /rootfs/files1 / diff --git a/distros/src/oth/Dockerfile.yum-fedora b/distros/src/oth/Dockerfile.yum-fedora index 9360edb6..f4dac2cd 100644 --- a/distros/src/oth/Dockerfile.yum-fedora +++ b/distros/src/oth/Dockerfile.yum-fedora @@ -6,15 +6,16 @@ FROM fedora:${VER} RUN \ # link yum ln -s /usr/bin/dnf /usr/bin/yum; \ - yum -y clean all && yum -y makecache \ + yum -y clean all && yum -y makecache; \ \ - && yum -y install iproute net-tools \ + yum -y install iproute net-tools \ sudo psmisc sysstat tree tmux lrzsz which wget openssl \ zip unzip \ procps jq \ lame \ iputils util-linux \ - && yum -y clean all + && yum -y clean all; \ + chmod u+s /bin/ping; # HEADLESS COPY --from=rootfs /rootfs/files1 /