cleanup image & update test
This commit is contained in:
parent
5f69b54f15
commit
242ebdc2ff
6 changed files with 19 additions and 20 deletions
doc
infrastructure/backup
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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!)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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!)
|
||||
|
|
Loading…
Add table
Reference in a new issue