feat: use dumb-init

Eric-2369 · Nov 22, 2024 · df43586 · df43586
1 parent f808d66
commit df43586
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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 [email protected] [email protected] @salesforce/cli@2.66.7 -g \
+RUN npm install [email protected] [email protected] @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 [email protected].3 \
+    && sf plugins install [email protected].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
@@ -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 [email protected] [email protected] @salesforce/cli@2.66.7 -g \
+RUN npm install [email protected] [email protected] @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 [email protected].3 \
+    && sf plugins install [email protected].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
@@ -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
@@ -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
@@ -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
@@ -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"