new try
This commit is contained in:
@ -10,8 +10,10 @@ if [ "$UPDATE_CODE_FROM_GIT" = "true" ]; then
|
|||||||
mkdir /tmp/clone
|
mkdir /tmp/clone
|
||||||
mkdir -p /app/logs
|
mkdir -p /app/logs
|
||||||
|
|
||||||
|
# Clear previous log
|
||||||
|
echo "Starting sync process at $(date)" > /app/logs/deploy.txt
|
||||||
# Clone the repository
|
# Clone the repository
|
||||||
echo "\r\n\r\n Cloning repository..." | tee -a /app/logs/deploy.txt
|
echo "\r\n\r\n Cloning repository..." | tee -a logs/deploy.txt
|
||||||
git clone -b ${GIT_BRANCH:-main} --depth 1 https://$GIT_USERNAME:${GIT_PASSWORD//@/%40}@git.d-popov.com/popov/mwitnessing.git /tmp/clone || exit 1
|
git clone -b ${GIT_BRANCH:-main} --depth 1 https://$GIT_USERNAME:${GIT_PASSWORD//@/%40}@git.d-popov.com/popov/mwitnessing.git /tmp/clone || exit 1
|
||||||
|
|
||||||
# Synchronize all files except package.json, package-lock.json, and the contents of /public/content
|
# Synchronize all files except package.json, package-lock.json, and the contents of /public/content
|
||||||
@ -19,22 +21,44 @@ if [ "$UPDATE_CODE_FROM_GIT" = "true" ]; then
|
|||||||
echo "\r\n\r\n Synchronizing files..."
|
echo "\r\n\r\n Synchronizing files..."
|
||||||
# rsync -av --update --exclude '/public/content' --exclude 'package.json' --exclude 'package-lock.json' /tmp/clone/ /app/ || echo "Rsync failed: Issue synchronizing files" | tee -a /app/logs/deploy.txt
|
# rsync -av --update --exclude '/public/content' --exclude 'package.json' --exclude 'package-lock.json' /tmp/clone/ /app/ || echo "Rsync failed: Issue synchronizing files" | tee -a /app/logs/deploy.txt
|
||||||
|
|
||||||
# Clear previous log
|
if [ -d "/app/public/content/permits" ]; then
|
||||||
echo "Starting sync process at $(date)" > /app/logs/deploy.txt
|
mv /app/public/content/permits /tmp/content/permits
|
||||||
|
echo "Permits folder backed up successfully." | tee -a /app/logs/deploy.txt
|
||||||
|
else
|
||||||
|
echo "Permits folder not found, skipping backup." | tee -a /app/logs/deploy.txt
|
||||||
|
fi
|
||||||
|
|
||||||
# Run rsync with verbose output and itemize-changes
|
# Run rsync with verbose output and itemize-changes
|
||||||
rsync -av --update --itemize-changes --exclude 'public/content' --exclude 'package.json' --exclude 'package-lock.json' /tmp/clone/ /app/ >> /app/logs/deploy.txt 2>&1
|
echo "Running rsync..." | tee -a /app/logs/deploy.txt
|
||||||
|
rsync -av --itemize-changes \
|
||||||
|
--exclude='package.json' \
|
||||||
|
--exclude='package-lock.json' \
|
||||||
|
/tmp/clone/ /app/ >> /app/logs/deploy.txt 2>&1
|
||||||
|
|
||||||
# Check rsync exit status
|
# Check rsync exit status
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Rsync failed: Issue synchronizing files" | tee -a /app/logs/deploy.txt
|
echo "Rsync failed: Issue synchronizing files" | tee -a /app/logs/deploy.txt
|
||||||
cat /app/logs/deploy.txt # Display the log contents
|
cat /app/logs/deploy.txt # Display the log contents
|
||||||
else
|
else
|
||||||
echo "Rsync completed successfully" | tee -a /app/logs/deploy.txt
|
echo "Rsync completed successfully" | tee -a /app/logs/deploy.txt
|
||||||
echo "Last few lines of rsync log:" | tee -a /app/logs/deploy.txt
|
echo "Last few lines of rsync log:" | tee -a /app/logs/deploy.txt
|
||||||
tail -n 20 /app/logs/deploy.txt # Display the last 20 lines of the log
|
tail -n 20 /app/logs/deploy.txt # Display the last 20 lines of the log
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Restore permits folder
|
||||||
|
echo "Restoring permits folder..." | tee -a /app/logs/deploy.txt
|
||||||
|
if [ -d "/tmp/content/permits" ]; then
|
||||||
|
# Ensure the destination directory exists
|
||||||
|
mkdir -p /app/public/content
|
||||||
|
mv /tmp/content/permits /app/public/content/permits
|
||||||
|
echo "Permits folder restored successfully." | tee -a /app/logs/deploy.txt
|
||||||
|
else
|
||||||
|
echo "No permits folder to restore." | tee -a /app/logs/deploy.txt
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check contents after restoration
|
||||||
|
echo "Contents of /app/public/content after restoration:" >> /app/logs/deploy.txt
|
||||||
|
ls -la /app/public/content >> /app/logs/deploy.txt 2>&1
|
||||||
|
|
||||||
|
|
||||||
echo "\r\n\r\n Checking for changes in package files..."
|
echo "\r\n\r\n Checking for changes in package files..."
|
||||||
|
Reference in New Issue
Block a user