From 7a08f489513fcca7e40c04c43a85f623ed4bfedf Mon Sep 17 00:00:00 2001
From: Jian Zeng <anonymousknight96@gmail.com>
Date: Tue, 13 Aug 2024 20:00:48 +0800
Subject: [PATCH] feat: adopt modern Dockerfile

Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
---
 apt-sync/Dockerfile         |  4 +++-
 aptsync/Dockerfile          |  7 ++++---
 aptsync/apt-mirror          |  0
 base/Dockerfile.alpine      |  4 +++-
 base/Dockerfile.alpine-edge |  4 +++-
 base/Dockerfile.debian      | 12 ++++++++----
 6 files changed, 21 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 aptsync/apt-mirror

diff --git a/apt-sync/Dockerfile b/apt-sync/Dockerfile
index b54919a..a9ff46f 100644
--- a/apt-sync/Dockerfile
+++ b/apt-sync/Dockerfile
@@ -1,7 +1,9 @@
 FROM ustcmirror/base:alpine
 LABEL maintainer="iBug <docker@ibugone.com>"
 LABEL bind_support=true
-RUN apk add --no-cache --update wget perl ca-certificates git python3 py3-requests && \
+RUN <<EOF
+    apk add --no-cache --update wget perl ca-certificates git python3 py3-requests
     mkdir -p /usr/local/lib/tunasync
+EOF
 ADD tunasync /usr/local/lib/tunasync
 ADD sync.sh sync.py /
diff --git a/aptsync/Dockerfile b/aptsync/Dockerfile
index 2653d40..2602d1d 100644
--- a/aptsync/Dockerfile
+++ b/aptsync/Dockerfile
@@ -4,8 +4,9 @@ LABEL bind_support=true
 ENV APTSYNC_NTHREADS=20 \
     APTSYNC_CREATE_DIR=true \
     APTSYNC_UNLINK=0
-RUN apk add --no-cache --update wget perl ca-certificates xz \
-        && mkdir -p /var/spool/apt-mirror/mirror /var/spool/apt-mirror/skel /etc/apt/
+RUN <<EOF
+    apk add --no-cache --update wget perl ca-certificates xz
+    mkdir -p /var/spool/apt-mirror/mirror /var/spool/apt-mirror/skel /etc/apt/
+EOF
 ADD ["apt-mirror", "/usr/local/bin/apt-mirror"]
-RUN chmod +x /usr/local/bin/apt-mirror
 ADD ["pre-sync.sh", "sync.sh", "/"]
diff --git a/aptsync/apt-mirror b/aptsync/apt-mirror
old mode 100644
new mode 100755
diff --git a/base/Dockerfile.alpine b/base/Dockerfile.alpine
index 6211bfc..6509bd7 100644
--- a/base/Dockerfile.alpine
+++ b/base/Dockerfile.alpine
@@ -1,8 +1,10 @@
 FROM alpine:3.20
 LABEL maintainer="Jian Zeng <anonymousknight96 AT gmail.com>" \
       org.ustcmirror.images=true
-RUN apk add --no-cache bash tzdata su-exec && \
+RUN <<EOF
+    apk add --no-cache bash tzdata su-exec
     ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+EOF
 ADD ["entry.sh", "savelog", "/usr/local/bin/"]
 ADD ["pip.conf", "/etc/"]
 VOLUME ["/data", "/log"]
diff --git a/base/Dockerfile.alpine-edge b/base/Dockerfile.alpine-edge
index bc14627..4a93586 100644
--- a/base/Dockerfile.alpine-edge
+++ b/base/Dockerfile.alpine-edge
@@ -1,8 +1,10 @@
 FROM alpine:edge
 LABEL maintainer="Yifan Gao<git AT yfgao.com>" \
       org.ustcmirror.images=true
-RUN apk add --no-cache bash tzdata su-exec && \
+RUN <<EOF
+    apk add --no-cache bash tzdata su-exec
     ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+EOF
 ADD ["entry.sh", "savelog", "/usr/local/bin/"]
 VOLUME ["/data", "/log"]
 CMD ["entry.sh"]
diff --git a/base/Dockerfile.debian b/base/Dockerfile.debian
index 80c6153..df36200 100644
--- a/base/Dockerfile.debian
+++ b/base/Dockerfile.debian
@@ -1,11 +1,15 @@
 FROM debian:bookworm-slim
 LABEL maintainer="Jian Zeng <anonymousknight96 AT gmail.com>" \
       org.ustcmirror.images=true
-RUN echo 'Asia/Shanghai' > /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 - && \
+RUN <<EOF
+    echo 'Asia/Shanghai' > /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/*
+EOF
 ADD ["entry.sh", "savelog", "/usr/local/bin/"]
 VOLUME ["/data", "/log"]
 CMD ["entry.sh"]