jimmy
/
restic-compose-backup
mirror of https://github.com/ZettaIO/restic-compose-backup.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to recent docker client

This commit is contained in:
Einar Forselv 2019-04-17 03:45:51 +02:00
parent 197cc16b01
commit 7a647c06b7
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
restic_volume_backup/backup_runner.py
View File

@ -4,12 +4,13 @@ import docker
from restic_volume_backup.config import Config from restic_volume_backup.config import Config
def run(): def run():
client = docker.Client(base_url=DOCKER_BASE_URL) config = Config()
client = docker.DockerClient(base_url=config.docker_base_url)
container = client.containers.run( container = client.containers.run(
'image', 'restic-volume-backup_backup',
'command', 'echo "Hello"',
labels={"restic-volume-backup.backup_process": True}, labels={"restic-volume-backup.backup_process": 'True'},
auto_remove=True, auto_remove=True,
remove=True, remove=True,
detach=True, detach=True,

10
restic_volume_backup/cli.py
View File

@ -3,6 +3,8 @@ import sys
from restic_volume_backup.config import Config from restic_volume_backup.config import Config
from restic_volume_backup.containers import RunningContainers from restic_volume_backup.containers import RunningContainers
from restic_volume_backup import backup_runner
from restic_volume_backup import restic
def main(): def main():
@ -22,17 +24,15 @@ def main():
print() print()
elif args.mode == 'backup': elif args.action == 'backup':
print("Starting backup ..") print("Starting backup ..")
# TODO: Errors when repo already exists # TODO: Errors when repo already exists
# restic.init_repo(Config.repository) restic.init_repo(config.repository)
backup_runner.run()
# for vol in containers.backup_volumes(): # for vol in containers.backup_volumes():
# restic.backup_volume(Config.repository, vol) # restic.backup_volume(Config.repository, vol)
elif args.mode == 'snapshots':
restic.snapshots(config.repository)
def parse_args(): def parse_args():
parser = argparse.ArgumentParser(prog='restic_volume_backup') parser = argparse.ArgumentParser(prog='restic_volume_backup')

2
restic_volume_backup/utils.py
View File

@ -6,7 +6,7 @@ from restic_volume_backup.config import Config
def list_containers(): def list_containers():
"""Easily mockable container list""" """Easily mockable container list"""
config = Config() config = Config()
client = docker.Client(base_url=config.docker_base_url) client = docker.APIClient(base_url=config.docker_base_url)
all_containers = client.containers() all_containers = client.containers()
client.close() client.close()
return all_containers return all_containers

2
setup.py
View File

@ -8,7 +8,7 @@ setup(
author_email="eforselv@gmail.com", author_email="eforselv@gmail.com",
packages=find_namespace_packages(include=['restic_volume_backup']), packages=find_namespace_packages(include=['restic_volume_backup']),
install_requires=[ install_requires=[
'docker-py==1.10.6', 'docker==3.7.2',
], ],
entry_points={'console_scripts': [ entry_points={'console_scripts': [
'restic-volume-backup = restic_volume_backup.cli:main', 'restic-volume-backup = restic_volume_backup.cli:main',