From df4358688d5eee99bd2d6b0159641f8f61a34b09 Mon Sep 17 00:00:00 2001 From: Eric-2369 Date: Fri, 22 Nov 2024 11:00:00 +0800 Subject: [PATCH] feat: use dumb-init --- debian11-python-shadowsocksr/Dockerfile | 5 +++-- debian12-codeserver/Dockerfile | 11 ++++++----- .../Dockerfile | 7 ++++--- debian12-nodejs-typescript-salesforcecli/Dockerfile | 7 ++++--- debian12-serverstatusrust-client/Dockerfile | 5 +++-- debian12-serverstatusrust-server/Dockerfile | 5 +++-- portainer-server/compose.yaml | 4 +--- traefik/compose.yaml | 4 +--- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/debian11-python-shadowsocksr/Dockerfile b/debian11-python-shadowsocksr/Dockerfile index a8cb465..c829c50 100644 --- a/debian11-python-shadowsocksr/Dockerfile +++ b/debian11-python-shadowsocksr/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bullseye-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates git openssh-client python3 \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates git openssh-client python3 \ && rm -rf /var/lib/apt/lists/* RUN useradd --create-home --shell /bin/bash shadowsocksr @@ -45,4 +45,5 @@ ENV OBFS_PARAM="" ENV DNS_IPV6="false" ENV TZ="Asia/Shanghai" -CMD ["/home/shadowsocksr/shadowsocksr/shadowsocks/start.sh"] +ENTRYPOINT ["/usr/bin/dumb-init", "--"] +CMD ["bash", "-c", "/home/shadowsocksr/shadowsocksr/shadowsocks/start.sh"] diff --git a/debian12-codeserver/Dockerfile b/debian12-codeserver/Dockerfile index 0b9e5f8..f22e1e0 100644 --- a/debian12-codeserver/Dockerfile +++ b/debian12-codeserver/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates git openssh-client dumb-init sudo wget vim zip unzip htop procps \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates git openssh-client sudo wget vim zip unzip htop procps \ && rm -rf /var/lib/apt/lists/* RUN useradd --create-home --shell /bin/bash eric2369 \ @@ -12,10 +12,10 @@ ARG TARGETPLATFORM RUN set -eux; \ case "${TARGETPLATFORM}" in \ "linux/amd64") \ - URL="https://github.com/coder/code-server/releases/download/v4.95.2/code-server_4.95.2_amd64.deb"; \ + URL="https://github.com/coder/code-server/releases/download/v4.95.3/code-server_4.95.3_amd64.deb"; \ ;; \ "linux/arm64") \ - URL="https://github.com/coder/code-server/releases/download/v4.95.2/code-server_4.95.2_arm64.deb"; \ + URL="https://github.com/coder/code-server/releases/download/v4.95.3/code-server_4.95.3_arm64.deb"; \ ;; \ *) \ echo "Unsupported platform: ${TARGETPLATFORM}"; \ @@ -50,11 +50,12 @@ RUN curl "https://sh.rustup.rs" --location --output - | bash -s -- -y --default- RUN echo "#!/bin/sh" > /home/eric2369/start.sh \ && echo "set -eu" >> /home/eric2369/start.sh \ - && echo "exec dumb-init /usr/bin/code-server --bind-addr 0.0.0.0:8080 --auth password --disable-telemetry --disable-update-check /home/eric2369/project" >> /home/eric2369/start.sh \ + && echo "exec /usr/bin/code-server --bind-addr 0.0.0.0:8080 --auth password --disable-telemetry --disable-update-check /home/eric2369/project" >> /home/eric2369/start.sh \ && chmod +x /home/eric2369/start.sh ENV PASSWORD="Eric2369" VOLUME /home/eric2369/project EXPOSE 8080 -CMD ["/home/eric2369/start.sh"] +ENTRYPOINT ["/usr/bin/dumb-init", "--"] +CMD ["bash", "-c", "/home/eric2369/start.sh"] diff --git a/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile b/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile index 9bde57e..fbb54f5 100644 --- a/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile +++ b/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates git openssh-client xz-utils \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates git openssh-client xz-utils \ && rm -rf /var/lib/apt/lists/* ARG TARGETPLATFORM @@ -21,16 +21,17 @@ RUN set -eux; \ esac; \ curl "${URL}" --location | tar --extract --xz --directory=/usr/local --strip-components=1 -RUN npm install typescript@5.6.3 tsx@4.19.2 @salesforce/cli@2.66.7 -g \ +RUN npm install typescript@5.6.3 tsx@4.19.2 @salesforce/cli@2.67.7 -g \ && npm cache clean --force RUN mkdir -p /root/.config/sf \ && echo '["sfdx-git-delta"]' > /root/.config/sf/unsignedPluginAllowList.json \ - && sf plugins install sfdx-git-delta@5.49.3 \ + && sf plugins install sfdx-git-delta@5.49.4 \ && npm cache clean --force RUN apt-get update \ && apt-get install -y --no-install-recommends chromium \ && rm -rf /var/lib/apt/lists/* +ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["/bin/bash"] diff --git a/debian12-nodejs-typescript-salesforcecli/Dockerfile b/debian12-nodejs-typescript-salesforcecli/Dockerfile index 4948214..1cc013a 100644 --- a/debian12-nodejs-typescript-salesforcecli/Dockerfile +++ b/debian12-nodejs-typescript-salesforcecli/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates git openssh-client xz-utils \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates git openssh-client xz-utils \ && rm -rf /var/lib/apt/lists/* ARG TARGETPLATFORM @@ -21,12 +21,13 @@ RUN set -eux; \ esac; \ curl "${URL}" --location | tar --extract --xz --directory=/usr/local --strip-components=1 -RUN npm install typescript@5.6.3 tsx@4.19.2 @salesforce/cli@2.66.7 -g \ +RUN npm install typescript@5.6.3 tsx@4.19.2 @salesforce/cli@2.67.7 -g \ && npm cache clean --force RUN mkdir -p /root/.config/sf \ && echo '["sfdx-git-delta"]' > /root/.config/sf/unsignedPluginAllowList.json \ - && sf plugins install sfdx-git-delta@5.49.3 \ + && sf plugins install sfdx-git-delta@5.49.4 \ && npm cache clean --force +ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["/bin/bash"] diff --git a/debian12-serverstatusrust-client/Dockerfile b/debian12-serverstatusrust-client/Dockerfile index 500adda..aa232c9 100644 --- a/debian12-serverstatusrust-client/Dockerfile +++ b/debian12-serverstatusrust-client/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates unzip procps iproute2 \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates unzip procps iproute2 \ && rm -rf /var/lib/apt/lists/* RUN useradd --create-home --shell /bin/bash serverstatus @@ -35,4 +35,5 @@ ENV ADDR="" ENV USER="" ENV PASS="" -CMD ["/home/serverstatus/start.sh"] +ENTRYPOINT ["/usr/bin/dumb-init", "--"] +CMD ["bash", "-c", "/home/serverstatus/start.sh"] diff --git a/debian12-serverstatusrust-server/Dockerfile b/debian12-serverstatusrust-server/Dockerfile index 2d2a893..3f36b4b 100644 --- a/debian12-serverstatusrust-server/Dockerfile +++ b/debian12-serverstatusrust-server/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-20241111-slim LABEL authors="eric2369" RUN apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates unzip procps iproute2 \ + && apt-get install -y --no-install-recommends dumb-init curl ca-certificates unzip procps iproute2 \ && rm -rf /var/lib/apt/lists/* RUN useradd --create-home --shell /bin/bash serverstatus @@ -36,4 +36,5 @@ RUN mkdir --parents /home/serverstatus/config \ VOLUME /home/serverstatus/config EXPOSE 8080 -CMD ["/home/serverstatus/start.sh"] +ENTRYPOINT ["/usr/bin/dumb-init", "--"] +CMD ["bash", "-c", "/home/serverstatus/start.sh"] diff --git a/portainer-server/compose.yaml b/portainer-server/compose.yaml index 6ffe4ef..f9741e2 100644 --- a/portainer-server/compose.yaml +++ b/portainer-server/compose.yaml @@ -1,8 +1,6 @@ -version: "3.9" - services: traefik: - image: "traefik:3.2.0" + image: "traefik:3.2.1" container_name: "traefik-container" command: - "--entryPoints.web.address=:80" diff --git a/traefik/compose.yaml b/traefik/compose.yaml index ce306e8..bfb3d8a 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -1,8 +1,6 @@ -version: "3.9" - services: traefik: - image: "traefik:3.2.0" + image: "traefik:3.2.1" container_name: "traefik-container" command: - "--entryPoints.web.address=:80"