From 2fbf6a5a6303632be3dfecbb904716636c18d6b5 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 16 Mar 2026 14:29:49 +0000 Subject: [PATCH 1/3] Replace docker commands with docker compose equivalents --- templates/docker-monolithic/backup.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/docker-monolithic/backup.sh b/templates/docker-monolithic/backup.sh index 61a80a62..13ccafb6 100644 --- a/templates/docker-monolithic/backup.sh +++ b/templates/docker-monolithic/backup.sh @@ -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)..." @@ -116,5 +116,5 @@ echo if ! $online; then echo "Restarting services..." - execute_command "docker restart supportpal" + execute_command "docker compose restart supportpal" fi From 1e066007e121338056a20cbe903b4fca7192e2b6 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 16 Mar 2026 14:32:24 +0000 Subject: [PATCH 2/3] Update docker cp to docker compose cp in restore.sh --- templates/docker-monolithic/restore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/docker-monolithic/restore.sh b/templates/docker-monolithic/restore.sh index 6e5bd239..98c402d9 100644 --- a/templates/docker-monolithic/restore.sh +++ b/templates/docker-monolithic/restore.sh @@ -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" From 57b43de094c468fe43f7d471bf925e787b3861df Mon Sep 17 00:00:00 2001 From: bytestream Date: Tue, 17 Mar 2026 11:03:08 +0000 Subject: [PATCH 3/3] fix(docker-monolithic): ensure removal of supportpal_qdrant volume does not fail --- templates/docker-monolithic/restore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/docker-monolithic/restore.sh b/templates/docker-monolithic/restore.sh index 98c402d9..25a80921 100644 --- a/templates/docker-monolithic/restore.sh +++ b/templates/docker-monolithic/restore.sh @@ -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..."