Switch ENTRYPOINT to try to resolve loop on start

[ci skip]

CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change log
+
+## 2.0.0 (unreleased)
+
+- Rewrite from Bash to Python
+- Add support for push notifications (#24)

backupbot.py

@@ -42,7 +42,7 @@ sys.excepthook = handle_exception
 @click.option('-l', '--log', 'loglevel')
 @click.option('-m', '--machine-logs', 'machine_logs', is_flag=True)
 @click.option('service', '--host', '-h', envvar='SERVICE')
-@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY', required=True)
+@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY')
 def cli(loglevel, service, repository, machine_logs):
     global SERVICE
     if service:
@@ -54,21 +54,25 @@ def cli(loglevel, service, repository, machine_logs):
         if not isinstance(numeric_level, int):
             raise ValueError('Invalid log level: %s' % loglevel)
         logger.setLevel(numeric_level)
+    logHandler = logging.StreamHandler()
     if machine_logs:
-        logHandler = logging.StreamHandler()
         formatter = jsonlogger.JsonFormatter(
             "%(levelname)s %(filename)s %(lineno)s %(process)d %(message)s", rename_fields={"levelname": "message_type"})
         logHandler.setFormatter(formatter)
-        logger.addHandler(logHandler)
+    logger.addHandler(logHandler)
 
     export_secrets()
     init_repo()
 
 
 def init_repo():
-    repo = os.environ['RESTIC_REPOSITORY']
+    if repo:= os.environ.get('RESTIC_REPOSITORY_FILE'):
+        # RESTIC_REPOSITORY_FILE and RESTIC_REPOSITORY are mutually exclusive
+        del os.environ['RESTIC_REPOSITORY']
+    else:
+        repo = os.environ['RESTIC_REPOSITORY']
+        restic.repository = repo
     logger.debug(f"set restic repository location: {repo}")
-    restic.repository = repo
     restic.password_file = '/var/run/secrets/restic_password'
     try:
         restic.cat.config()
@@ -146,7 +150,7 @@ def copy_secrets(apps):
         if (app_name in apps and
                 (app_secs := s.attrs['Spec']['TaskTemplate']['ContainerSpec'].get('Secrets'))):
             if not container_by_service.get(s.name):
-                logger.error(
+                logger.warning(
                     f"Container {s.name} is not running, secrets can not be copied.")
                 continue
             container_id = container_by_service[s.name].id
@@ -157,6 +161,7 @@ def copy_secrets(apps):
                         f"For the secret {sec['SecretName']} the file {src} does not exist for {s.name}")
                     continue
                 dst = SECRET_PATH + sec['SecretName']
+                logger.debug("Copy Secret {sec['SecretName']}")
                 copyfile(src, dst)
 
 
@@ -184,6 +189,8 @@ def run_commands(commands):
 def backup_volumes(backup_paths, apps, retries, dry_run=False):
     while True:
         try:
+            logger.info("Start volume backup")
+            logger.debug(backup_paths)
             result = restic.backup(backup_paths, dry_run=dry_run, tags=apps)
             logger.summary("backup finished", extra=result)
             return