diff --git a/docker-compose.git.yml b/docker-compose.git.yml index 1f131a8..e86fe31 100644 --- a/docker-compose.git.yml +++ b/docker-compose.git.yml @@ -5,7 +5,7 @@ services: dockerfile: Dockerfile.git container_name: git_worker volumes: - - ./data/html:/app + - ./data:/app - ./data/logs/git/:/var/log/ environment: - REPO_URL=${REPO_URL} diff --git a/docker/entrypoint.git.sh b/docker/entrypoint.git.sh index 6355335..2f4219d 100644 --- a/docker/entrypoint.git.sh +++ b/docker/entrypoint.git.sh @@ -1,20 +1,21 @@ #!/bin/bash -REPO_URL=${REPO_URL:-https://github.com/your/repo.git} -BRANCH=${BRANCH:-main} +REPO_URL=${REPO_URL} +BRANCH=${BRANCH} +TARGET_DIR=/app/html # 若資料夾為空則 clone -if [ -z "$(ls -A /app | grep -v 'entrypoint.sh')" ]; then - echo "[git-worker] Cloning repository..." - git clone --branch "$BRANCH" "$REPO_URL" /app +if [ -z "$(ls -A "$TARGET_DIR")" ]; then + echo "[git-worker] Cloning repository into $TARGET_DIR..." + git clone --branch "$BRANCH" "$REPO_URL" "$TARGET_DIR" else - echo "[git-worker] Repository exists, skipping clone." + echo "[git-worker] Repository exists in $TARGET_DIR, skipping clone." fi # 定時 git pull echo "[git-worker] Starting periodic git pull..." while true; do - cd /app + cd "$TARGET_DIR" || exit echo "[git-worker] Pulling latest changes from $BRANCH..." git pull origin "$BRANCH" sleep 300