From 75cb35b954baca44c7166e13fe789cb638997594 Mon Sep 17 00:00:00 2001
From: YuruC3 <98943911+YuruC3@@users.noreply.github.com>
Date: Mon, 30 Jun 2025 15:52:44 +0200
Subject: [PATCH] Docker image update

---
 docker.tar.gz             | Bin 0 -> 4568 bytes
 docker/cron-jobs          |   5 ++-
 docker/docker-compose.yml |   8 ++---
 docker/gitPush.sh         |  73 ++++++++++++++++++++++++++++----------
 4 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 docker.tar.gz

diff --git a/docker.tar.gz b/docker.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..3be7b2f83851bbe27d42b4102f6e0839b08764af
GIT binary patch
literal 4568
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
CHuNC?

literal 0
HcmV?d00001

diff --git a/docker/cron-jobs b/docker/cron-jobs
index ec48208..cc20a27 100644
--- a/docker/cron-jobs
+++ b/docker/cron-jobs
@@ -1,8 +1,11 @@
 # python
+20 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainOPNsense.py 
+25 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainDocker.py 
+# 20 19 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainOPNsense.py 
 # 25 19 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainDocker.py 
 #*/3 * * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainDocker.py 
 #*/3 * * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainOPNsense.py 
 
 # git push 
-# 30 19 * * * /bin/sh /etc/debmirror/gitPush.sh
+30 */4 * * * /bin/sh /etc/debmirror/gitPush.sh
 #*/1 * * * * /bin/sh /etc/debmirror/gitPush.sh
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 0c40460..9c51747 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,14 +3,14 @@
 services:
   debmirup:
     container_name: Debian_Mirrors_Updater
-    build: ./
-    image: debmirrorupd:V2.0.1
+    # build: ./
+    image: yuruc3/debianrepolist:v0.3
     environment:
       - DEBMIRRORURL=https://www.debian.org/mirror/list
       - GITURLPROTO=https
       - GITURL=tea.shupogaki.org
-      - GITREPOPATH=YuruC3/Debain-repos.git
-      - GITEA_TOKEN=<CHANGHE_ME>
+      - GITREPOPATH=YuruC3/Repo-IP-lists.git
+      - GITEA_TOKEN=0938a2033324b987bbcb2976b56d147a9a00d8a2
       - EXTRAREPOS=True
       - SECURITYREPOS=True
     restart: unless-stopped
diff --git a/docker/gitPush.sh b/docker/gitPush.sh
index f79280c..96b1ca5 100644
--- a/docker/gitPush.sh
+++ b/docker/gitPush.sh
@@ -5,39 +5,74 @@ WORKPTH="/etc/debmirror/"
 REPO_DIR="$WORKPTH/Repo-IP-lists"
 REPO_URL="${GITURLPROTO}://${GITURL}/${GITREPOPATH}"
 
-
-# Clone repo only if it doesn't already exist
+# Clone repo if not exists
 if [ ! -d "$REPO_DIR/.git" ]; then
     echo "[$(date)] Cloning repository..."
     git clone "$REPO_URL" "$REPO_DIR"
 fi
 
-
 cd "$REPO_DIR"
-
 git remote set-url origin "https://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
 
+
 git config user.name "UpdateBot"
 git config user.email "UpdateBot@localhost.local"
 
-# stage files
+# Stage the files
 git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
 
-# If anything to commit locally, commit it now
+# Only proceed if there are staged changes
 if ! git diff --quiet --cached; then
-    echo "[$(date)] Committing local changes before pulling"
-    git commit -m "Auto-commit before pull on $(date -Iseconds)"
-fi
-
-# Now pull the latest
-git pull --rebase --autostash
-
-# Commit and push only if there's anything new staged
-if git diff --quiet; then
-    echo "[$(date)] No changes to commit."
-else
-    git commit -a -m "Auto-update mirror list on $(date -Iseconds)" --quiet
+    echo "[$(date)] Committing and pushing changes..."
+    git commit -m "Auto-update mirror list on $(date -Iseconds)"
+    git pull --rebase --autostash
     git push --quiet
-    echo "[$(date)] Changes pushed successfully."
+    echo "[$(date)] Changes pushed."
+else
+    echo "[$(date)] No changes to commit or push."
 fi
 
+
+# #!/bin/sh
+# set -e
+
+# WORKPTH="/etc/debmirror/"
+# REPO_DIRd="$WORKPTH/Repo-IP-lists"
+# REPO_URL="${GITURLPROTO}://${GITURL}/${GITREPOPATH}"
+
+
+# # Clone repo only if it doesn't already exist
+# if [ ! -d "$REPO_DIR/.git" ]; then
+#     echo "[$(date)] Cloning repository..."
+#     git clone "$REPO_URL" "$REPO_DIR"
+# fi
+
+
+# cd "$REPO_DIR"
+
+# git remote set-url origin "https://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
+
+# git config user.name "UpdateBot"
+# git config user.email "UpdateBot@localhost.local"
+
+# # stage files
+# git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
+
+# # If anything to commit locally, commit it now
+# if ! git diff --quiet --cached; then
+#     echo "[$(date)] Committing local changes before pulling"
+#     git commit -m "Auto-commit before pull on $(date -Iseconds)"
+# fi
+
+# # Now pull the latest
+# git pull --rebase --autostash
+
+# # Commit and push only if there's anything new staged
+# if git diff --quiet; then
+#     echo "[$(date)] No changes to commit."
+# else
+#     git commit -a -m "Auto-update mirror list on $(date -Iseconds)" --quiet
+#     git push --quiet
+#     echo "[$(date)] Changes pushed successfully."
+# fi
+