From 66081cf89fadde0bec53be63ac64a5cee5af5f3b Mon Sep 17 00:00:00 2001 From: Eric-2369 Date: Sat, 18 Jan 2025 16:00:00 +0800 Subject: [PATCH] chore: update package version --- debian11-python-shadowsocksr/Dockerfile | 4 ++-- debian12-codeserver/Dockerfile | 5 ++--- .../Dockerfile | 10 +++++----- debian12-nodejs-typescript-salesforcecli/Dockerfile | 10 +++++----- debian12-serverstatusrust-client/Dockerfile | 4 ++-- debian12-serverstatusrust-server/Dockerfile | 4 ++-- portainer-server/compose.yaml | 2 +- traefik/compose.yaml | 2 +- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/debian11-python-shadowsocksr/Dockerfile b/debian11-python-shadowsocksr/Dockerfile index 06fad2f..c3940f2 100644 --- a/debian11-python-shadowsocksr/Dockerfile +++ b/debian11-python-shadowsocksr/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-20241223-slim +FROM debian:bullseye-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -11,7 +11,7 @@ USER shadowsocksr RUN git clone --branch manyuser "https://github.com/shadowsocksrr/shadowsocksr.git" /home/shadowsocksr/shadowsocksr -RUN echo '#!/bin/bash' > /home/shadowsocksr/shadowsocksr/shadowsocks/start.sh \ +RUN echo '#!/bin/bash -euo pipefail' > /home/shadowsocksr/shadowsocksr/shadowsocks/start.sh \ && echo 'cat << EOF > /home/shadowsocksr/shadowsocksr/shadowsocks/config.json' >> /home/shadowsocksr/shadowsocksr/shadowsocks/start.sh \ && echo '{' >> /home/shadowsocksr/shadowsocksr/shadowsocks/start.sh \ && echo '"server":"0.0.0.0",' >> /home/shadowsocksr/shadowsocksr/shadowsocks/start.sh \ diff --git a/debian12-codeserver/Dockerfile b/debian12-codeserver/Dockerfile index 04ba67f..8987025 100644 --- a/debian12-codeserver/Dockerfile +++ b/debian12-codeserver/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241223-slim +FROM debian:bookworm-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -48,8 +48,7 @@ RUN curl "https://get.sdkman.io" --location --output - | bash RUN curl "https://sh.rustup.rs" --location --output - | bash -s -- -y --default-toolchain none -RUN echo "#!/bin/sh" > /home/eric2369/start.sh \ - && echo "set -eu" >> /home/eric2369/start.sh \ +RUN echo "#!/bin/bash -euo pipefail" > /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 diff --git a/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile b/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile index 429ba62..72037f2 100644 --- a/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile +++ b/debian12-nodejs-typescript-salesforcecli-chromium/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241223-slim +FROM debian:bookworm-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -9,10 +9,10 @@ ARG TARGETPLATFORM RUN set -eux; \ case "${TARGETPLATFORM}" in \ "linux/amd64") \ - URL="https://nodejs.org/dist/v22.12.0/node-v22.12.0-linux-x64.tar.xz"; \ + URL="https://nodejs.org/dist/v22.13.0/node-v22.13.0-linux-x64.tar.xz"; \ ;; \ "linux/arm64") \ - URL="https://nodejs.org/dist/v22.12.0/node-v22.12.0-linux-arm64.tar.xz"; \ + URL="https://nodejs.org/dist/v22.13.0/node-v22.13.0-linux-arm64.tar.xz"; \ ;; \ *) \ echo "Unsupported platform: ${TARGETPLATFORM}"; \ @@ -21,12 +21,12 @@ RUN set -eux; \ esac; \ curl "${URL}" --location | tar --extract --xz --directory=/usr/local --strip-components=1 -RUN npm install typescript@5.7.2 tsx@4.19.2 @salesforce/cli@2.70.7 -g \ +RUN npm install typescript@5.7.3 tsx@4.19.2 @salesforce/cli@2.72.21 -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.52.0 \ + && sf plugins install sfdx-git-delta@6.1.1 \ && npm cache clean --force RUN apt-get update \ diff --git a/debian12-nodejs-typescript-salesforcecli/Dockerfile b/debian12-nodejs-typescript-salesforcecli/Dockerfile index fce367b..5fed448 100644 --- a/debian12-nodejs-typescript-salesforcecli/Dockerfile +++ b/debian12-nodejs-typescript-salesforcecli/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241223-slim +FROM debian:bookworm-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -9,10 +9,10 @@ ARG TARGETPLATFORM RUN set -eux; \ case "${TARGETPLATFORM}" in \ "linux/amd64") \ - URL="https://nodejs.org/dist/v22.12.0/node-v22.12.0-linux-x64.tar.xz"; \ + URL="https://nodejs.org/dist/v22.13.0/node-v22.13.0-linux-x64.tar.xz"; \ ;; \ "linux/arm64") \ - URL="https://nodejs.org/dist/v22.12.0/node-v22.12.0-linux-arm64.tar.xz"; \ + URL="https://nodejs.org/dist/v22.13.0/node-v22.13.0-linux-arm64.tar.xz"; \ ;; \ *) \ echo "Unsupported platform: ${TARGETPLATFORM}"; \ @@ -21,12 +21,12 @@ RUN set -eux; \ esac; \ curl "${URL}" --location | tar --extract --xz --directory=/usr/local --strip-components=1 -RUN npm install typescript@5.7.2 tsx@4.19.2 @salesforce/cli@2.70.7 -g \ +RUN npm install typescript@5.7.3 tsx@4.19.2 @salesforce/cli@2.72.21 -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.52.0 \ + && sf plugins install sfdx-git-delta@6.1.1 \ && npm cache clean --force ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/debian12-serverstatusrust-client/Dockerfile b/debian12-serverstatusrust-client/Dockerfile index 439981d..533cc30 100644 --- a/debian12-serverstatusrust-client/Dockerfile +++ b/debian12-serverstatusrust-client/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241223-slim +FROM debian:bookworm-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -27,7 +27,7 @@ RUN set -eux; \ unzip /home/serverstatus/serverstatus.zip -d /home/serverstatus; \ rm /home/serverstatus/serverstatus.zip -RUN echo '#!/bin/bash' > /home/serverstatus/start.sh \ +RUN echo '#!/bin/bash -euo pipefail' > /home/serverstatus/start.sh \ && echo 'exec /home/serverstatus/stat_client --addr "$ADDR" --user "$USER" --pass "$PASS" --interval "$INTERVAL"' >> /home/serverstatus/start.sh \ && chmod +x /home/serverstatus/start.sh diff --git a/debian12-serverstatusrust-server/Dockerfile b/debian12-serverstatusrust-server/Dockerfile index 182c579..7c844fa 100644 --- a/debian12-serverstatusrust-server/Dockerfile +++ b/debian12-serverstatusrust-server/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241223-slim +FROM debian:bookworm-20250113-slim LABEL authors="eric2369" RUN apt-get update \ @@ -29,7 +29,7 @@ RUN set -eux; \ RUN mkdir --parents /home/serverstatus/config \ && mv /home/serverstatus/config.toml /home/serverstatus/config/config.toml \ - && echo '#!/bin/bash' > /home/serverstatus/start.sh \ + && echo '#!/bin/bash -euo pipefail' > /home/serverstatus/start.sh \ && echo 'exec /home/serverstatus/stat_server -c /home/serverstatus/config/config.toml' >> /home/serverstatus/start.sh \ && chmod +x /home/serverstatus/start.sh diff --git a/portainer-server/compose.yaml b/portainer-server/compose.yaml index c353821..8899987 100644 --- a/portainer-server/compose.yaml +++ b/portainer-server/compose.yaml @@ -1,6 +1,6 @@ services: traefik: - image: "traefik:3.2.3" + image: "traefik:3.3.2" container_name: "traefik-container" command: - "--entryPoints.web.address=:80" diff --git a/traefik/compose.yaml b/traefik/compose.yaml index fe3289c..a2c4f86 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -1,6 +1,6 @@ services: traefik: - image: "traefik:3.2.3" + image: "traefik:3.3.2" container_name: "traefik-container" command: - "--entryPoints.web.address=:80"