diff --git a/docker/Dockerfile b/docker/Dockerfile index 755777b..1b1f48e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,9 +4,6 @@ FROM alpine:latest ENV DEBMIRRORURL="https://www.debian.org/mirror/list" ENV EXTRAREPOS=True ENV SECURITYREPOS=True -ENV GITURLPROTO=https -ENV GITURL=tea.shupogaki.org -ENV GITREPOPATH=YuruC3/Debain-repos.git RUN apk update && \ apk add python3 py3-pip git @@ -15,9 +12,9 @@ RUN apk update && \ RUN mkdir /etc/debmirror WORKDIR /etc/debmirror/ -RUN git clone {{GITURLPROTO}}://{{GITURL}}/{{GITREPOPATH}} && \ - ln -s /etc/debmirror/Debain-repos/MirrorListV4 /etc/debmirror/MirrorListV4 && \ - ln -s /etc/debmirror/Debain-repos/MirrorListV6 /etc/debmirror/MirrorListV6 +RUN git clone https://tea.shupogaki.org/YuruC3/Repo-IP-lists && \ + ln -s /etc/debmirror/Repo-IP-lists/MirrorListV4 /etc/debmirror/MirrorListV4 && \ + ln -s /etc/debmirror/Repo-IP-lists/MirrorListV6 /etc/debmirror/MirrorListV6 # RUN touch /etc/debmirror/MirrorListV6 && \ # touch /etc/debmirror/MirrorListV4 diff --git a/docker/gitPush.sh b/docker/gitPush.sh index 3689be9..585041c 100644 --- a/docker/gitPush.sh +++ b/docker/gitPush.sh @@ -2,7 +2,7 @@ set -e WORKPTH="/etc/debmirror/" -REPO_DIR="$WORKPTH/Debain-repos" +REPO_DIR="$WORKPTH/Repo-IP-lists" REPO_URL="${GITURLPROTO}://${GITURL}/${GITREPOPATH}" @@ -21,7 +21,7 @@ git config user.name "UpdateBot" git config user.email "UpdateBot@localhost.local" # If anything to commit locally, commit it now -if ! git diff --cached --quiet; then +if ! git diff --quiet; then echo "[$(date)] Committing local changes before pulling" git commit -m "Auto-commit before pull on $(date -Iseconds)" fi @@ -33,11 +33,11 @@ git pull --rebase --autostash git add MirrorListV4 MirrorListV6 # Commit and push only if there's anything new staged -if git diff --cached --quiet; then +if git diff --quiet; then echo "[$(date)] No changes to commit." else - git commit -m "Auto-update mirror list on $(date -Iseconds)" - git push + git commit -a -m "Auto-update mirror list on $(date -Iseconds)" --quiet + git push --quiet echo "[$(date)] Changes pushed successfully." fi