From 725fa3c580a12c5213ed5aafe22e930f5829aac5 Mon Sep 17 00:00:00 2001 From: HexStan Date: Tue, 28 Apr 2026 01:53:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96Docker=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=92=8C=E9=83=A8=E7=BD=B2=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E8=BF=9B=E9=85=8D=E7=BD=AE=E6=8C=81=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 ++ docker/README.md | 2 +- docker/compose.yml | 2 +- docker/s6-rc.d/sc-init/type | 1 + docker/s6-rc.d/sc-init/up | 5 +++++ docker/s6-rc.d/user/contents.d/sc-init | 0 6 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 docker/s6-rc.d/sc-init/type create mode 100644 docker/s6-rc.d/sc-init/up create mode 100644 docker/s6-rc.d/user/contents.d/sc-init diff --git a/Dockerfile b/Dockerfile index 8471cf417..8530df033 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,6 +65,7 @@ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \ #复制文件 COPY --from=builder /etc/ShellCrash /etc/ShellCrash COPY --from=builder /tmp/CrashCore.tar.gz /etc/ShellCrash/CrashCore.tar.gz +RUN cp -a /etc/ShellCrash /etc/ShellCrash_backup COPY --from=builder /etc/profile /etc/profile COPY --from=builder /usr/bin/crash /usr/bin/crash @@ -74,6 +75,7 @@ COPY --from=builder /tmp/s6_noarch.tar.xz /tmp/s6_noarch.tar.xz RUN tar -xJf /tmp/s6_noarch.tar.xz -C / && rm -rf /tmp/s6_noarch.tar.xz RUN tar -xJf /tmp/s6_arch.tar.xz -C / && rm -rf /tmp/s6_arch.tar.xz COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d +RUN chmod +x /etc/s6-overlay/s6-rc.d/sc-init/up ENV S6_CMD_WAIT_FOR_SERVICES=1 ENTRYPOINT ["/init"] diff --git a/docker/README.md b/docker/README.md index c3daaa645..1e244800d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -88,7 +88,7 @@ mkdir -p /root/ShellCrash ```shell docker run -d \ ……………… - -v shellcrash_configs:/etc/ShellCrash/configs \ + -v shellcrash_configs:/etc/ShellCrash \ ……………… ``` diff --git a/docker/compose.yml b/docker/compose.yml index d246815bf..b8cc9f863 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -17,7 +17,7 @@ services: - net.ipv4.ip_forward: 1 # - net.ipv6.conf.all.forwarding=1 volumes: - - shellcrash_configs:/etc/ShellCrash/configs:rw + - shellcrash_configs:/etc/ShellCrash:rw restart: unless-stopped volumes: diff --git a/docker/s6-rc.d/sc-init/type b/docker/s6-rc.d/sc-init/type new file mode 100644 index 000000000..3d92b15f2 --- /dev/null +++ b/docker/s6-rc.d/sc-init/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/docker/s6-rc.d/sc-init/up b/docker/s6-rc.d/sc-init/up new file mode 100644 index 000000000..a9aa9195c --- /dev/null +++ b/docker/s6-rc.d/sc-init/up @@ -0,0 +1,5 @@ +#!/bin/sh +if [ ! -d "/etc/ShellCrash" ] || [ -z "$(ls -A /etc/ShellCrash 2>/dev/null)" ]; then + mkdir -p /etc/ShellCrash + cp -a /etc/ShellCrash_backup/. /etc/ShellCrash/ +fi diff --git a/docker/s6-rc.d/user/contents.d/sc-init b/docker/s6-rc.d/user/contents.d/sc-init new file mode 100644 index 000000000..e69de29bb From bdb3953a077324e8baf5779d96677ecbb470417f Mon Sep 17 00:00:00 2001 From: HexStan Date: Tue, 28 Apr 2026 02:29:35 +0800 Subject: [PATCH 2/3] fix --- docker/s6-rc.d/sc-init/up | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docker/s6-rc.d/sc-init/up b/docker/s6-rc.d/sc-init/up index a9aa9195c..c47dec15c 100644 --- a/docker/s6-rc.d/sc-init/up +++ b/docker/s6-rc.d/sc-init/up @@ -1,5 +1,10 @@ -#!/bin/sh -if [ ! -d "/etc/ShellCrash" ] || [ -z "$(ls -A /etc/ShellCrash 2>/dev/null)" ]; then - mkdir -p /etc/ShellCrash - cp -a /etc/ShellCrash_backup/. /etc/ShellCrash/ -fi +#!/command/execlineb -P +foreground { + if { test ! -d /etc/ShellCrash } + mkdir -p /etc/ShellCrash +} +foreground { + if { sh -c "[ -z \"$(ls -A /etc/ShellCrash 2>/dev/null)\" ]" } + cp -a /etc/ShellCrash_backup/. /etc/ShellCrash/ +} +exit 0 From a508b92fdd02627a6645cc316e44fb69eb2c5ee5 Mon Sep 17 00:00:00 2001 From: HexStan Date: Tue, 28 Apr 2026 22:20:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=BA=86=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=B2=A1=E7=94=A8=E7=9A=84=20chmod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8530df033..5c16b1824 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,6 @@ COPY --from=builder /tmp/s6_noarch.tar.xz /tmp/s6_noarch.tar.xz RUN tar -xJf /tmp/s6_noarch.tar.xz -C / && rm -rf /tmp/s6_noarch.tar.xz RUN tar -xJf /tmp/s6_arch.tar.xz -C / && rm -rf /tmp/s6_arch.tar.xz COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d -RUN chmod +x /etc/s6-overlay/s6-rc.d/sc-init/up ENV S6_CMD_WAIT_FOR_SERVICES=1 ENTRYPOINT ["/init"]