From 8c923c698e460ee4f63e0dbae7f02690ab10fae1 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Sun, 27 Apr 2025 00:13:24 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20du=20script=20de=20d=C3=A9p?= =?UTF-8?q?loiement=20:=20remplacement=20de=20git=20pull=20par=20git=20fet?= =?UTF-8?q?ch=20et=20git=20reset=20pour=20une=20mise=20=C3=A0=20jour=20plu?= =?UTF-8?q?s=20s=C3=A9curis=C3=A9e=20du=20d=C3=A9p=C3=B4t.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index 68ed269..5ee338b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -29,13 +29,14 @@ trap cleanup EXIT main() { log "Starting deployment..." - # Git pull force - log "Pulling latest changes from the repository..." - git pull origin main --force + log "Updating repository to match remote main branch..." + git fetch origin + git reset --hard origin/main if [ $? -ne 0 ]; then - log "Failed to pull latest changes." + log "Failed to update to the latest main branch." exit 1 fi + log "Repository successfully updated to latest main branch." # Lancer le docker log "Building and starting Docker containers..."