From 8dace8727a2dd050f64f310830f85982b2b87d7c Mon Sep 17 00:00:00 2001
From: Yufei Zheng <74892256+ritaanthem@users.noreply.github.com>
Date: Thu, 14 Sep 2023 22:38:02 +0800
Subject: [PATCH 1/3] Update Dockerfile.alpine from 3.14 to 3.16

---
 base/Dockerfile.alpine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile.alpine b/base/Dockerfile.alpine
index 778c570..aad9ae0 100644
--- a/base/Dockerfile.alpine
+++ b/base/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 LABEL maintainer="Jian Zeng <anonymousknight96 AT gmail.com>" \
       org.ustcmirror.images=true
 ADD ["entry.sh", "savelog", "/usr/local/bin/"]

From 4408118e312e272db114beb948bc484b44eaefdd Mon Sep 17 00:00:00 2001
From: ritaanthem <zyf2001@mail.ustc.edu.cn>
Date: Thu, 14 Sep 2023 23:28:58 +0800
Subject: [PATCH 2/3] Upgrade Alpine to 3.16 for rsync

---
 archvsync/Dockerfile | 2 +-
 debian-cd/Dockerfile | 2 +-
 fedora/Dockerfile    | 2 +-
 rsync/Dockerfile     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archvsync/Dockerfile b/archvsync/Dockerfile
index 772f31b..2a703b9 100644
--- a/archvsync/Dockerfile
+++ b/archvsync/Dockerfile
@@ -1,4 +1,4 @@
-FROM ustcmirror/base:alpine-3.12
+FROM ustcmirror/base:alpine
 LABEL maintainer="Jian Zeng <anonymousknight96 AT gmail.com>"
 ENV BASEDIR=/usr/local
 RUN apk add --no-cache rsync && mkdir -p "$BASEDIR/etc"
diff --git a/debian-cd/Dockerfile b/debian-cd/Dockerfile
index 6980b40..8c9c409 100644
--- a/debian-cd/Dockerfile
+++ b/debian-cd/Dockerfile
@@ -1,4 +1,4 @@
-FROM ustcmirror/base:alpine-3.12
+FROM ustcmirror/base:alpine
 LABEL maintainer "Jian Zeng <anonymousknight96 AT gmail.com>"
 VOLUME ["/debian"]
 ADD ["sync.sh", "pre-sync.sh", "prepare.sh", "/"]
diff --git a/fedora/Dockerfile b/fedora/Dockerfile
index 5042bdf..faf66a9 100644
--- a/fedora/Dockerfile
+++ b/fedora/Dockerfile
@@ -1,4 +1,4 @@
-FROM ustcmirror/base:alpine-3.12
+FROM ustcmirror/base:alpine
 LABEL maintainer "Shengjing Zhu <zsj950618@gmail.com>"
 RUN apk add --no-cache zsh curl rsync ca-certificates gawk grep bzip2 coreutils diffutils findutils \
     && curl -fLo /usr/local/bin/quick-fedora-mirror https://pagure.io/quick-fedora-mirror/raw/master/f/quick-fedora-mirror \
diff --git a/rsync/Dockerfile b/rsync/Dockerfile
index 87e9a10..8b13dd6 100644
--- a/rsync/Dockerfile
+++ b/rsync/Dockerfile
@@ -1,10 +1,10 @@
-FROM ustcmirror/base:alpine-3.12 AS builder
+FROM ustcmirror/base:alpine AS builder
 RUN apk add --no-cache build-base
 WORKDIR /tmp
 ADD lchmod.c .
 RUN gcc -Wall -fPIC -shared -o lchmod.so lchmod.c
 
-FROM ustcmirror/base:alpine-3.12
+FROM ustcmirror/base:alpine
 LABEL maintainer "Jian Zeng <anonymousknight96 AT gmail.com>"
 RUN apk add --no-cache rsync openssh-client
 ADD sync.sh /

From 277b26c5738f8480085a6ca73ca87c2f24c0c30f Mon Sep 17 00:00:00 2001
From: ritaanthem <zyf2001@mail.ustc.edu.cn>
Date: Fri, 15 Sep 2023 07:54:12 +0800
Subject: [PATCH 3/3] delete alpine 3.12

---
 base/Dockerfile.alpine-3.12 | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 base/Dockerfile.alpine-3.12

diff --git a/base/Dockerfile.alpine-3.12 b/base/Dockerfile.alpine-3.12
deleted file mode 100644
index b8d3a7e..0000000
--- a/base/Dockerfile.alpine-3.12
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM alpine:3.12
-LABEL maintainer="Yifan Gao<git AT yfgao.com>" \
-      org.ustcmirror.images=true
-ADD ["entry.sh", "savelog", "/usr/local/bin/"]
-VOLUME ["/data", "/log"]
-ENTRYPOINT ["entry.sh"]
-RUN apk add --no-cache bash tzdata su-exec && \
-    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime