fix: restore with drop

Author: cc3630

README.md

@@ -161,6 +161,7 @@ S3 支持使用虚拟域名作为 endpoint，即可以将 region 或者 bucket 
 
 - MONGO_URI
 - MONGO_FILE_PREFIX
+- MONGO_DROP: 选填，在集合恢复前移除原有内容
 - BACKUP_LATEST_FILE
 - BACKUP_PWD
 

docker/restore.py

@@ -17,6 +17,7 @@
 must_inputs = ["MONGO_URI"]
 other_inputs = [
     "FILE_PREFIX",
+    "MONGO_DROP",
     "BACKUP_PATH",
     "BACKUP_PWD",
     # S3 CONFIG
@@ -52,6 +53,7 @@ def check_bool(key):
 uri = os.environ["MONGO_URI"]
 
 # 选填
+mongo_drop = check_bool("MONGO_DROP") if check_var("MONGO_DROP") else False
 backup_path = (
     os.environ["BACKUP_PATH"] if check_var("BACKUP_PATH") else DEFAULT_BACKUP_PATH
 )
@@ -128,7 +130,11 @@ def restore_file(file_path):
         )
 
     # 恢复数据
-    cmd = f'mongorestore --uri="{uri}" --gzip --archive={restore_path}'
+    other_cmd = "--gzip"
+    if mongo_drop:
+        other_cmd += " --drop"
+
+    cmd = f'mongorestore --uri="{uri}" {other_cmd} --archive={restore_path}'
     subprocess.call(cmd, shell=True)
 
     if is_crypt_file and backup_pwd:

helm-chart/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.7.0
+version: 1.7.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.7.0"
+appVersion: "1.7.1"

helm-chart/values.yaml

@@ -69,7 +69,7 @@ backup:
   image:
     registry: ""
     repository: 36node/mongodb-backup
-    tag: 1.7.0
+    tag: 1.7.1
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -134,7 +134,7 @@ restore:
   image:
     registry: ""
     repository: 36node/mongodb-backup
-    tag: 1.7.0
+    tag: 1.7.1
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'