From 242ebdc2ff225b75add084983020ec9d8f4b1dd1 Mon Sep 17 00:00:00 2001
From: Michael Jerger <michael.jerger@meissa-gmbh.de>
Date: Sat, 11 Jan 2025 11:32:17 +0100
Subject: [PATCH] cleanup image & update test
---
doc/LiveUpgrade.md | 2 +-
infrastructure/backup/image/Dockerfile | 2 +-
.../backup/image/resources2/exports.sh | 1 -
.../backup/image/resources2/test.bb | 13 ++++++-------
infrastructure/backup/test/Dockerfile | 2 +-
infrastructure/backup/test/resources/test.bb | 19 ++++++++++---------
6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/doc/LiveUpgrade.md b/doc/LiveUpgrade.md
index 985ca69..01fce4d 100644
--- a/doc/LiveUpgrade.md
+++ b/doc/LiveUpgrade.md
@@ -11,7 +11,7 @@
- 7.2.0: nextcloud 27 (manual publish)
- 10.0.0: nextcloud 28.0.5
- 10.1.0: nextcloud 29.0.0
-- 10.4.0: nextcloud 30
+- 10.4.2: nextcloud 30
## Uprgrading process
diff --git a/infrastructure/backup/image/Dockerfile b/infrastructure/backup/image/Dockerfile
index 72f7ab5..02a85be 100644
--- a/infrastructure/backup/image/Dockerfile
+++ b/infrastructure/backup/image/Dockerfile
@@ -4,4 +4,4 @@ FROM domaindrivenarchitecture/dda-backup:5.2.1
ADD resources /tmp
RUN /tmp/install.bb
RUN init.bb
-ADD resources2 /tmp
+#ADD resources2 /tmp
diff --git a/infrastructure/backup/image/resources2/exports.sh b/infrastructure/backup/image/resources2/exports.sh
index f15d339..6d72249 100644
--- a/infrastructure/backup/image/resources2/exports.sh
+++ b/infrastructure/backup/image/resources2/exports.sh
@@ -1,4 +1,3 @@
-export ENV_PASSWORD=env-password
export RESTIC_PASSWORD_FILE=/tmp/file_password
export RESTIC_REPOSITORY=/var/restic-repo
export POSTGRES_SERVICE=dummy
diff --git a/infrastructure/backup/image/resources2/test.bb b/infrastructure/backup/image/resources2/test.bb
index 3604da7..5f7fec6 100755
--- a/infrastructure/backup/image/resources2/test.bb
+++ b/infrastructure/backup/image/resources2/test.bb
@@ -13,8 +13,6 @@
(defn prepare!
[]
- (println (bc/env-or-file "RESTIC_PASSWORD_FILE"))
- (println (bc/env-or-file "ENV_PASSWORD"))
(tasks/shell "mkdir" "-p" "/var/backups/")
(tasks/shell "mkdir" "-p" "/var/restic-repo/")
(spit "/var/backups/file" "I was here"))
@@ -22,8 +20,8 @@
(defn restic-repo-init!
[]
(rc/init! cf/file-config)
- (rc/init! (merge cf/db-config))
- (rc/init! (merge cf/db-role-config)))
+ (rc/init! (merge cf/db-role-config cf/dry-run))
+ (rc/init! (merge cf/db-config cf/dry-run)))
(defn restic-backup!
[]
@@ -37,16 +35,17 @@
(rc/list-snapshots! (merge cf/db-role-config cf/dry-run))
(rc/list-snapshots! (merge cf/db-config cf/dry-run)))
+
(defn restic-restore!
[]
- (println "huhu")
- (rs/restore-file! (merge cf/file-restore-config {:debug true}))
(pg/drop-create-db! (merge cf/db-config cf/dry-run))
(rs/restore-db-roles! (merge cf/db-role-config cf/dry-run))
- (rs/restore-db! (merge cf/db-config cf/dry-run)))
+ (rs/restore-db! (merge cf/db-config cf/dry-run))
+ (rs/restore-file! cf/file-restore-config))
(prepare!)
(restic-repo-init!)
(restic-backup!)
(list-snapshots!)
(restic-restore!)
+
diff --git a/infrastructure/backup/test/Dockerfile b/infrastructure/backup/test/Dockerfile
index aa4f637..ffa87cf 100644
--- a/infrastructure/backup/test/Dockerfile
+++ b/infrastructure/backup/test/Dockerfile
@@ -1,4 +1,4 @@
FROM c4k-cloud-backup:latest
ADD resources /tmp/
-RUN ENV_PASSWORD=env-password RESTIC_PASSWORD_FILE_FILE=/tmp/file_password RESTIC_REPOSITORY=restic-repo POSTGRES_SERVICE=dummy POSTGRES_PORT=dummy POSTGRES_DB=dummy POSTGRES_USER=dummy POSTGRES_PASSWORD=dummy AWS_ACCESS_KEY_ID=dummy AWS_SECRET_ACCESS_KEY=dummy /tmp/test.bb
+RUN RESTIC_PASSWORD_FILE=/tmp/file_password RESTIC_REPOSITORY=restic-repo POSTGRES_SERVICE=dummy POSTGRES_PORT=dummy POSTGRES_DB=dummy POSTGRES_USER=dummy POSTGRES_PASSWORD=dummy AWS_ACCESS_KEY_ID=dummy AWS_SECRET_ACCESS_KEY=dummy /tmp/test.bb
diff --git a/infrastructure/backup/test/resources/test.bb b/infrastructure/backup/test/resources/test.bb
index 3c3903e..4a1a6ef 100755
--- a/infrastructure/backup/test/resources/test.bb
+++ b/infrastructure/backup/test/resources/test.bb
@@ -4,7 +4,6 @@
(-> "/usr/local/bin/config.clj" fs/file load-file)
(require '[babashka.tasks :as tasks]
- '[dda.backup.core :as bc]
'[dda.backup.restic :as rc]
'[dda.backup.postgresql :as pg]
'[dda.backup.backup :as bak]
@@ -13,36 +12,38 @@
(defn prepare!
[]
- (println (bc/env-or-file "RESTIC_PASSWORD_FILE"))
- (println (bc/env-or-file "ENV_PASSWORD"))
(tasks/shell "mkdir" "-p" "/var/backups/")
(spit "/var/backups/file" "I was here")
(tasks/shell "mkdir" "-p" "/var/restore"))
(defn restic-repo-init!
[]
- (rc/init! (merge cf/file-config cf/dry-run))
+ (rc/init! cf/file-config)
+ (rc/init! (merge cf/db-role-config cf/dry-run))
(rc/init! (merge cf/db-config cf/dry-run)))
(defn restic-backup!
[]
(bak/backup-file! cf/file-config)
+ (bak/backup-db-roles! (merge cf/db-role-config cf/dry-run))
(bak/backup-db! (merge cf/db-config cf/dry-run)))
(defn list-snapshots!
[]
(rc/list-snapshots! cf/file-config)
+ (rc/list-snapshots! (merge cf/db-role-config cf/dry-run))
(rc/list-snapshots! (merge cf/db-config cf/dry-run)))
(defn restic-restore!
[]
- (rs/restore-file! cf/file-config)
(pg/drop-create-db! (merge cf/db-config cf/dry-run))
- (rs/restore-db! (merge cf/db-config cf/dry-run)))
+ (rs/restore-db-roles! (merge cf/db-role-config cf/dry-run))
+ (rs/restore-db! (merge cf/db-config cf/dry-run))
+ (rs/restore-file! (merge cf/file-restore-config cf/dry-run)))
(prepare!)
(restic-repo-init!)
-#(restic-backup!)
-#(list-snapshots!)
-#(restic-restore!)
+(restic-backup!)
+(list-snapshots!)
+(restic-restore!)