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 " ENV BASEDIR=/usr/local RUN apk add --no-cache rsync && mkdir -p "$BASEDIR/etc" 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 " \ org.ustcmirror.images=true ADD ["entry.sh", "savelog", "/usr/local/bin/"] 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" \ - 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 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 " 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 " 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 " RUN apk add --no-cache rsync openssh-client ADD sync.sh /