diff --git a/cd-watch.sh b/cd-watch.sh index 2cefe71..4161317 100644 --- a/cd-watch.sh +++ b/cd-watch.sh @@ -8,7 +8,7 @@ LOG_FILE="$APP_DIR/data/deploy.log" mkdir -p "$APP_DIR/data" cd "$APP_DIR" -remote_rev="$(git ls-remote origin refs/heads/main | awk '{print $1}')" +remote_rev="$(git -c credential.helper="store --file=/var/services/homes/whitekomani/.git-credentials" ls-remote origin refs/heads/main | awk '{print $1}')" if [ -z "$remote_rev" ]; then echo "$(date '+%Y-%m-%d %H:%M:%S') no remote revision found" >> "$LOG_FILE" exit 1 diff --git a/deploy.sh b/deploy.sh index e09b03d..eaee4ee 100644 --- a/deploy.sh +++ b/deploy.sh @@ -16,7 +16,7 @@ trap 'rmdir "$LOCK_DIR"' EXIT cd "$APP_DIR" echo "$(date '+%Y-%m-%d %H:%M:%S') deploy start" >> "$LOG_FILE" -git fetch origin main >> "$LOG_FILE" 2>&1 +git -c credential.helper="store --file=/var/services/homes/whitekomani/.git-credentials" fetch origin main >> "$LOG_FILE" 2>&1 git reset --hard origin/main >> "$LOG_FILE" 2>&1 /usr/local/bin/docker build -t photoreq:latest . >> "$LOG_FILE" 2>&1