From cf8884e913c1b2715e8f37a657dbcd59ee290d22 Mon Sep 17 00:00:00 2001 From: Jian Zeng Date: Tue, 13 Aug 2024 21:19:18 +0800 Subject: [PATCH] feat: adopt modern Dockerfile (#122) * feat: adopt modern Dockerfile Signed-off-by: Jian Zeng * fix(debian): RUN command with bash Signed-off-by: Jian Zeng * refactor: prepare.sh is not needed anymore Signed-off-by: Jian Zeng --------- Signed-off-by: Jian Zeng --- apt-sync/Dockerfile | 5 ++++- aptsync/Dockerfile | 8 +++++--- aptsync/apt-mirror | 0 base/Dockerfile.alpine | 5 ++++- base/Dockerfile.alpine-edge | 5 ++++- base/Dockerfile.debian | 18 +++++++++++++----- debian-cd/Dockerfile | 13 +++++++++++-- debian-cd/prepare.sh | 9 --------- docker-ce/Dockerfile | 8 +++++--- fedora/Dockerfile | 9 ++++++--- ghcup/Dockerfile | 22 ++++++++++++++++++++-- ghcup/prepare.sh | 16 ---------------- github-release/Dockerfile | 3 +-- google-repo/Dockerfile | 7 +++++-- gsutil-rsync/Dockerfile | 9 +++++---- julia-storage/Dockerfile | 13 ++++++++----- nix-channels/Dockerfile | 20 +++++++++++--------- pypi/Dockerfile | 7 +++++-- rclone/Dockerfile | 11 +++++++---- shadowmire/Dockerfile | 11 +++++++---- stackage/Dockerfile | 19 +++++++++++++++++-- stackage/prepare.sh | 13 ------------- tsumugu/Dockerfile | 11 +++++++---- winget-source/Dockerfile | 10 +++++++--- yukina/Dockerfile | 11 +++++++---- 25 files changed, 159 insertions(+), 104 deletions(-) mode change 100644 => 100755 aptsync/apt-mirror delete mode 100755 debian-cd/prepare.sh delete mode 100644 ghcup/prepare.sh delete mode 100755 stackage/prepare.sh diff --git a/apt-sync/Dockerfile b/apt-sync/Dockerfile index b54919a..038a41a 100644 --- a/apt-sync/Dockerfile +++ b/apt-sync/Dockerfile @@ -1,7 +1,10 @@ FROM ustcmirror/base:alpine LABEL maintainer="iBug " LABEL bind_support=true -RUN apk add --no-cache --update wget perl ca-certificates git python3 py3-requests && \ +RUN < /etc/timezone && dpkg-reconfigure -f noninteractive tzdata && \ - apt-get update && apt-get install -y wget && \ - wget -O /usr/local/bin/su-exec https://ftp.lug.ustc.edu.cn/misc/su-exec && chmod +x /usr/local/bin/su-exec && \ - echo "592f25c51d0e4c90945ece8c4fa35018d20a1091ac109c98b66eb95deef211c7 /usr/local/bin/su-exec" | sha256sum -c - && \ - apt-get purge -y --auto-remove wget && rm -rf /var/lib/apt/lists/* +RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \ + --mount=type=cache,sharing=locked,target=/var/lib/apt < /etc/timezone +dpkg-reconfigure -f noninteractive tzdata +apt-get update && apt-get install -y wget +wget -O /usr/local/bin/su-exec https://ftp.lug.ustc.edu.cn/misc/su-exec +chmod +x /usr/local/bin/su-exec +echo "592f25c51d0e4c90945ece8c4fa35018d20a1091ac109c98b66eb95deef211c7 /usr/local/bin/su-exec" | sha256sum -c - +apt-get purge -y --auto-remove wget +EOF ADD ["entry.sh", "savelog", "/usr/local/bin/"] VOLUME ["/data", "/log"] CMD ["entry.sh"] diff --git a/debian-cd/Dockerfile b/debian-cd/Dockerfile index ea1cd42..9bb0d7f 100644 --- a/debian-cd/Dockerfile +++ b/debian-cd/Dockerfile @@ -2,7 +2,16 @@ FROM ustcmirror/base:alpine LABEL maintainer="Jian Zeng " LABEL bind_support=true VOLUME ["/debian"] -ADD ["sync.sh", "pre-sync.sh", "prepare.sh", "/"] +ADD ["sync.sh", "pre-sync.sh", "/"] ADD ["jigdo-mirror", "cd-mirror", "/usr/local/bin/"] ADD jigdo-mirror.conf.in /etc/jigdo/ -RUN /prepare.sh && rm /prepare.sh +RUN <