Skip to content

[Automated] Merge 5.x into master #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bytestream merged 3 commits into from
Mar 17, 2026
Merged

[Automated] Merge 5.x into master #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fbf6a5
Replace docker commands with docker compose equivalents
bytestream Mar 16, 2026
1e06600
Update docker cp to docker compose cp in restore.sh
bytestream Mar 16, 2026
57b43de
fix(docker-monolithic): ensure removal of supportpal_qdrant volume do…
bytestream Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions templates/docker-monolithic/backup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,29 @@ mkdir -p "${ABS_BACKUP_PATH}/"

echo 'Backing up filesystem...'
mkdir -p "${TMP_DIR}/filesystem-${TIMESTAMP}/config"
docker cp supportpal:/var/www/supportpal/config/production "${TMP_DIR}/filesystem-${TIMESTAMP}/config/" || { echo "error: failed to copy config/production from container"; exit 1; }
docker cp supportpal:/var/www/supportpal/storage "${TMP_DIR}/filesystem-${TIMESTAMP}/" || { echo "error: failed to copy storage from container"; exit 1; }
docker cp supportpal:/var/www/supportpal/addons "${TMP_DIR}/filesystem-${TIMESTAMP}/" || { echo "error: failed to copy addons from container"; exit 1; }
docker compose cp supportpal:/var/www/supportpal/config/production "${TMP_DIR}/filesystem-${TIMESTAMP}/config/" || { echo "error: failed to copy config/production from container"; exit 1; }
docker compose cp supportpal:/var/www/supportpal/storage "${TMP_DIR}/filesystem-${TIMESTAMP}/" || { echo "error: failed to copy storage from container"; exit 1; }
docker compose cp supportpal:/var/www/supportpal/addons "${TMP_DIR}/filesystem-${TIMESTAMP}/" || { echo "error: failed to copy addons from container"; exit 1; }
(cd "${TMP_DIR}" && tar -czf "${FILESYSTEM_BACKUP_NAME}" "filesystem-${TIMESTAMP}" && rm -rf "filesystem-${TIMESTAMP}")

echo 'Backing up database...'
DB_BACKUP_PATH=$(docker compose exec supportpal bash -c "cd ${COMMAND_PATH} && php artisan db:backup --store-local | grep -oE '/var/www/supportpal/.*/database-.*'")
DB_FILE_NAME=$(echo "${DB_BACKUP_PATH}" | xargs basename)
docker cp "supportpal:${DB_BACKUP_PATH}" "${TMP_DIR}/" || { echo "error: failed to copy database backup from container"; exit 1; }
docker compose cp "supportpal:${DB_BACKUP_PATH}" "${TMP_DIR}/" || { echo "error: failed to copy database backup from container"; exit 1; }
docker compose exec supportpal bash -c "rm ${DB_BACKUP_PATH}"

echo 'Backing up volume data...'
mkdir -p "${TMP_DIR}/volumes-monolithic/cache"
mkdir -p "${TMP_DIR}/volumes-monolithic/caddy"
docker cp supportpal:/redis-data "${TMP_DIR}/volumes-monolithic/cache/" || { echo "error: failed to copy redis-data from container"; exit 1; }
docker cp supportpal:/caddy "${TMP_DIR}/volumes-monolithic/caddy/" || { echo "error: failed to copy caddy from container"; exit 1; }
docker compose cp supportpal:/redis-data "${TMP_DIR}/volumes-monolithic/cache/" || { echo "error: failed to copy redis-data from container"; exit 1; }
docker compose cp supportpal:/caddy "${TMP_DIR}/volumes-monolithic/caddy/" || { echo "error: failed to copy caddy from container"; exit 1; }
if docker compose exec -u root supportpal bash -c "test -d /meilisearch"; then
mkdir -p "${TMP_DIR}/volumes-monolithic/meilisearch"
docker cp supportpal:/meilisearch "${TMP_DIR}/volumes-monolithic/meilisearch/" || { echo "error: failed to copy meilisearch from container"; exit 1; }
docker compose cp supportpal:/meilisearch "${TMP_DIR}/volumes-monolithic/meilisearch/" || { echo "error: failed to copy meilisearch from container"; exit 1; }
fi
if docker compose exec -u root supportpal bash -c "test -d /qdrant"; then
mkdir -p "${TMP_DIR}/volumes-monolithic/qdrant"
docker cp supportpal:/qdrant "${TMP_DIR}/volumes-monolithic/qdrant/" || { echo "error: failed to copy qdrant from container"; exit 1; }
docker compose cp supportpal:/qdrant "${TMP_DIR}/volumes-monolithic/qdrant/" || { echo "error: failed to copy qdrant from container"; exit 1; }
fi

echo "Backing up current working directory: $(pwd)..."
Expand All @@ -116,5 +116,5 @@ echo

if ! $online; then
echo "Restarting services..."
execute_command "docker restart supportpal"
execute_command "docker compose restart supportpal"
fi
4 changes: 2 additions & 2 deletions templates/docker-monolithic/restore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ if tar "-$TAR_LIST_FLAGS" "${LAST_BACKUP_DIR}/$LAST_BACKUP_FILE" 2>/dev/null | g
execute_command "docker volume rm supportpal_addons"
execute_command "docker volume rm supportpal_caddy"
execute_command "docker volume rm supportpal_meilisearch"
execute_command "docker volume rm supportpal_qdrant"
execute_command "docker volume rm supportpal_qdrant || true"
fi

echo "Restoring docker files to $RESTORE_PATH..."
Expand Down Expand Up @@ -178,7 +178,7 @@ docker compose exec supportpal bash -c "
echo "Restoring..."

docker compose exec supportpal bash -c "mkdir -p ${TEMP_BACKUP_DIR}"
execute_command "docker cp ""${LAST_BACKUP_DIR}/${LAST_BACKUP_FILE}"" ""supportpal:${TEMP_BACKUP_DIR}/"""
execute_command "docker compose cp ""${LAST_BACKUP_DIR}/${LAST_BACKUP_FILE}"" ""supportpal:${TEMP_BACKUP_DIR}/"""
TAR_EXTRACT_FLAGS=$(get_tar_flags "$LAST_BACKUP_FILE" "xv")
TAR_OUTPUT=$(docker compose exec supportpal bash -c "cd ${TEMP_BACKUP_DIR} && tar -${TAR_EXTRACT_FLAGS} ${LAST_BACKUP_FILE}")
docker compose exec supportpal bash -c "cd ${COMMAND_PATH} && php artisan app:restore ${TEMP_BACKUP_DIR}/${LAST_BACKUP_FILE} --no-verify --force"
Expand Down
Loading