Skip to content

Speedup populate_jail + don't overwrite existing data#1278

Merged
rdjjke merged 2 commits intomainfrom
dont-overwrite-data-from-jail/0
Aug 1, 2025
Merged

Speedup populate_jail + don't overwrite existing data#1278
rdjjke merged 2 commits intomainfrom
dont-overwrite-data-from-jail/0

Conversation

@rdjjke
Copy link
Collaborator

@rdjjke rdjjke commented Jul 22, 2025

No description provided.

@rdjjke rdjjke changed the title Dont overwrite data from jail/0 Dont overwrite data from jail Jul 22, 2025
@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch 2 times, most recently from 56406fa to c4e18c4 Compare July 22, 2025 17:55
@theyoprst theyoprst changed the base branch from dev to main July 29, 2025 18:05
@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch 2 times, most recently from 63c7d97 to 75d83c5 Compare July 30, 2025 17:01
@rdjjke rdjjke added the feature label Jul 30, 2025
@rdjjke rdjjke marked this pull request as ready for review July 30, 2025 17:04
@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch from 75d83c5 to 741e94e Compare July 30, 2025 17:09
@rdjjke rdjjke changed the title Dont overwrite data from jail Speedup populate_jail + don't overwrite existing data Jul 30, 2025
@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch 5 times, most recently from 3f0a2c0 to e47ed7b Compare July 31, 2025 18:15
@theyoprst theyoprst requested a review from Copilot July 31, 2025 18:17
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR optimizes the jail population process by switching from file-based copying to restic backup/restore and implements logic to avoid overwriting existing jail data unless explicitly requested.

  • Replace rclone/rsync with restic for faster jail population
  • Add intelligent overwrite protection that checks for existing rootfs content
  • Optimize container image by removing unnecessary AWS CLI examples

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File Description
populate_jail_entrypoint.sh Refactored to use restic and added conditional population logic
populate_jail.dockerfile Changed base image to restic and modified build process to create restic backup
jail.dockerfile Added jail version tracking
install_awscli.sh Cleanup to remove AWS CLI examples directory

@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch from e47ed7b to e71e551 Compare July 31, 2025 18:46
@rdjjke rdjjke force-pushed the dont-overwrite-data-from-jail/0 branch from e71e551 to b1c18c4 Compare July 31, 2025 18:55
@rdjjke rdjjke merged commit a46d648 into main Aug 1, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants