diff --git a/community-containers/borgbackup-viewer/borgbackup-viewer.json b/community-containers/borgbackup-viewer/borgbackup-viewer.json
new file mode 100644
index 00000000..417cc660
--- /dev/null
+++ b/community-containers/borgbackup-viewer/borgbackup-viewer.json
@@ -0,0 +1,70 @@
+{
+ "aio_services_v1": [
+ {
+ "container_name": "nextcloud-aio-borgbackup-viewer",
+ "image_tag": "v1",
+ "display_name": "Borg Backup Viewer",
+ "documentation": "https://github.com/nextcloud/all-in-one/tree/main/community-containers/borgbackup-viewer",
+ "image": "szaimen/aio-borgbackup-viewer",
+ "internal_port": "5801",
+ "ports": [
+ {
+ "ip_binding": "",
+ "port_number": "5801",
+ "protocol": "tcp"
+ }
+ ],
+ "environment": [
+ "BORG_HOST_ID=nextcloud-aio-borgbackup-viewer",
+ "WEB_AUTHENTICATION_USERNAME=nextcloud",
+ "WEB_AUTHENTICATION_PASSWORD=%BORGBACKUP_VIEWER_PASSWORD%",
+ "WEB_LISTENING_PORT=5801",
+ "BORG_PASSPHRASE=%BORGBACKUP_PASSWORD%",
+ "BORG_REPO=/mnt/borgbackup/borg"
+ ],
+ "secrets": [
+ "BORGBACKUP_VIEWER_PASSWORD",
+ "BORGBACKUP_PASSWORD"
+ ],
+ "volumes": [
+ {
+ "source": "nextcloud_aio_backup_cache",
+ "destination": "/root",
+ "writeable": true
+ },
+ {
+ "source": "%NEXTCLOUD_DATADIR%",
+ "destination": "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data",
+ "writeable": true
+ },
+ {
+ "source": "nextcloud_aio_mastercontainer",
+ "destination": "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer",
+ "writeable": true
+ },
+ {
+ "source": "%BORGBACKUP_HOST_LOCATION%",
+ "destination": "/mnt/borgbackup",
+ "writeable": true
+ },
+ {
+ "source": "nextcloud_aio_elasticsearch",
+ "destination": "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch",
+ "writeable": true
+ },
+ {
+ "source": "nextcloud_aio_redis",
+ "destination": "/mnt/redis",
+ "writeable": true
+ }
+ ],
+ "devices": [
+ "/dev/fuse"
+ ],
+ "cap_add": [
+ "SYS_ADMIN"
+ ],
+ "apparmor_unconfined": true
+ }
+ ]
+}
diff --git a/community-containers/borgbackup-viewer/readme.md b/community-containers/borgbackup-viewer/readme.md
new file mode 100644
index 00000000..42b692ec
--- /dev/null
+++ b/community-containers/borgbackup-viewer/readme.md
@@ -0,0 +1,17 @@
+## Borgbackup Viewer
+This container allows to view the local borg repository in a web session. It also allows you to restore files and folders from the backup by using desktop programs in a web browser.
+
+### Notes
+- After adding and starting the container, you need to visit `https://ip.address.of.this.server:5801` in order to log in with the user `nextcloud` and the password that you can retrieve when running `sudo docker inspect nextcloud-aio-borgbackup-viewer | grep WEB_AUTHENTICATION_PASSWORD`. (It uses a self-signed certificate, so you need to accept the warning).
+- Then, you should see a terminal. There type in `borg mount /mnt/borgbackup/borg /tmp/borg` to mount the backup archive at `/tmp/borg` inside the container. Afterwards type in `nautilus /tmp/borg` which will show a file explorer and allows you to see all the files. You can then copy files and folders back to their initial mountpoints inside `/nextcloud_aio_volumes/`, `/host_mounts/` and `/docker_volumes/`. ⚠️ Be very carefully while doing that as can break your instance!
+- After you are done with the operation, click on the terminal in the background and press `[CTRL]+[c]` multiple times to close any open application. Then run `umount /tmp/borg` to unmount the mountpoint correctly.
+- You can also delete specific archives by running `borg list`, delete a specific archive e.g. via `borg delete --stats --progress "::20220223_174237-nextcloud-aio"` and compact the archives via `borg compact`. After doing so, make sure to update the backup archives list in the AIO interface! You can do so by clicking on the `Check backup integrity` button or `Create backup` button.
+- ⚠️ After you are done doing your operations, remove the container for better security again from the stack: https://github.com/nextcloud/all-in-one/tree/main/community-containers#how-to-remove-containers-from-aios-stack
+- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
+
+### Repository
+https://github.com/szaimen/aio-borgbackup-viewer
+
+### Maintainer
+https://github.com/szaimen
+
diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index e3d7c337..39c612cf 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -541,19 +541,23 @@ readonly class DockerActionManager {
$mounts = [];
// Special things for the backup container which should not be exposed in the containers.json
- if ($container->GetIdentifier() === 'nextcloud-aio-borgbackup') {
+ if (str_starts_with($container->GetIdentifier(), 'nextcloud-aio-borgbackup')) {
// Additional backup directories
foreach ($this->getAllBackupVolumes() as $additionalBackupVolumes) {
if ($additionalBackupVolumes !== '') {
$mounts[] = ["Type" => "volume", "Source" => $additionalBackupVolumes, "Target" => "/nextcloud_aio_volumes/" . $additionalBackupVolumes, "ReadOnly" => false];
}
}
+
+ // Make volumes read only in case of borgbackup container. The viewer makes them writeable
+ $isReadOnly = $container->GetIdentifier() === 'nextcloud-aio-borgbackup';
+
foreach ($this->configurationManager->GetAdditionalBackupDirectoriesArray() as $additionalBackupDirectories) {
if ($additionalBackupDirectories !== '') {
if (!str_starts_with($additionalBackupDirectories, '/')) {
- $mounts[] = ["Type" => "volume", "Source" => $additionalBackupDirectories, "Target" => "/docker_volumes/" . $additionalBackupDirectories, "ReadOnly" => true];
+ $mounts[] = ["Type" => "volume", "Source" => $additionalBackupDirectories, "Target" => "/docker_volumes/" . $additionalBackupDirectories, "ReadOnly" => $isReadOnly];
} else {
- $mounts[] = ["Type" => "bind", "Source" => $additionalBackupDirectories, "Target" => "/host_mounts" . $additionalBackupDirectories, "ReadOnly" => true, "BindOptions" => ["NonRecursive" => true]];
+ $mounts[] = ["Type" => "bind", "Source" => $additionalBackupDirectories, "Target" => "/host_mounts" . $additionalBackupDirectories, "ReadOnly" => $isReadOnly, "BindOptions" => ["NonRecursive" => true]];
}
}
}
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 57dfc3f1..91c5f2a7 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -504,6 +504,9 @@
{% endif %}
{% if has_backup_run_once == true %}
+ Backup Viewer
+ There is now a community container that allows to access your backups in a web session. See this documentation.
+
Backup check
Click on the button below to perform a backup integrity check. This is an option that verifies that your backup is intact. It shouldn't be needed in most situations.