Merge 936089ee99 into 405bd4af15

.readthedocs.yaml

@@ -1,24 +0,0 @@
-# Read the Docs configuration file for Sphinx projects
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the OS, Python version and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.10"
-
-# Build documentation in the "docs/" directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
-# formats:
-#   - pdf
-#   - epub
-
-python:
-  install:
-    - requirements: docs/requirements.txt

src/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Dump all env vars so we can source them in cron jobs
-rcb dump-env > /env.sh
+printenv | sed 's/^\(.*\)$/export \1/g' > /env.sh
 
 # Write crontab
 rcb crontab > crontab

src/restic_compose_backup/__init__.py

@@ -1 +1 @@
-__version__ = '0.7.1'
+__version__ = '0.6.0'

src/restic_compose_backup/cli.py

@@ -51,9 +51,6 @@ def main():
     elif args.action == "crontab":
         crontab(config)
 
-    elif args.action == "dump-env":
-        dump_env()
-
     # Random test stuff here
     elif args.action == "test":
         nodes = utils.get_swarm_nodes()
@@ -293,14 +290,6 @@ def crontab(config):
     print(cron.generate_crontab(config))
 
 
-def dump_env():
-    """Dump all environment variables to a script that can be sourced from cron"""
-    print("#!/bin/bash")
-    print("# This file was generated by restic-compose-backup")
-    for key, value in os.environ.items():
-        print("export {}='{}'".format(key, value))
-
-
 def parse_args():
     parser = argparse.ArgumentParser(prog='restic_compose_backup')
     parser.add_argument(
@@ -314,7 +303,6 @@ def parse_args():
             'cleanup',
             'version',
             'crontab',
-            'dump-env',
             'test',
         ],
     )

src/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_namespace_packages
 setup(
     name="restic-compose-backup",
     url="https://github.com/ZettaIO/restic-compose-backup",
-    version="0.7.1",
+    version="0.7.0",
     author="Einar Forselv",
     author_email="eforselv@gmail.com",
     packages=find_namespace_packages(include=[