diff --git a/docker-compose.yaml b/docker-compose.yaml index 1edf6f8..31cc86d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,13 +4,13 @@ services: build: ./src env_file: - restic_compose_backup.env - - alerts.env + # - alerts.env labels: restic-compose-backup.volumes: true restic-compose-backup.volumes.include: 'src' - networks: - - default - - global + # networks: + # - default + # - global volumes: # Map in docker socket - /var/run/docker.sock:/tmp/docker.sock:ro @@ -67,11 +67,16 @@ services: volumes: - pgdata:/var/lib/postgresql/data + # InfluxDB OSS + # influxdb: + # image: influxdb:1.8 + volumes: mysqldata: mariadbdata: pgdata: + # influx_data: -networks: - global: - external: true +# networks: +# global: +# external: true diff --git a/restic_compose_backup.env b/restic_compose_backup.env index 8f07544..501ad77 100644 --- a/restic_compose_backup.env +++ b/restic_compose_backup.env @@ -4,7 +4,7 @@ # DOCKER_TLS_VERIFY=1 # DOCKER_CERT_PATH='' -SWARM_MODE=true +SWARM_MODE=false INCLUDE_PROJECT_NAME=false EXCLUDE_BIND_MOUNTS=false diff --git a/src/Dockerfile b/src/Dockerfile index 7f711da..499a096 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,6 +1,7 @@ -FROM restic/restic:0.9.6 +FROM restic/restic:0.15.1 -RUN apk update && apk add python3 dcron mariadb-client postgresql-client +RUN apk update && apk add python3 py3-pip dcron +# mariadb-client postgresql-client ADD . /restic-compose-backup WORKDIR /restic-compose-backup diff --git a/src/restic_compose_backup/__init__.py b/src/restic_compose_backup/__init__.py index ef7eb44..1f356cc 100644 --- a/src/restic_compose_backup/__init__.py +++ b/src/restic_compose_backup/__init__.py @@ -1 +1 @@ -__version__ = '0.6.0' +__version__ = '1.0.0' diff --git a/src/setup.py b/src/setup.py index 84b3338..1af3014 100644 --- a/src/setup.py +++ b/src/setup.py @@ -3,12 +3,13 @@ from setuptools import setup, find_namespace_packages setup( name="restic-compose-backup", url="https://github.com/ZettaIO/restic-compose-backup", - version="0.6.0", + version="1.0.0", author="Einar Forselv", author_email="eforselv@gmail.com", packages=find_namespace_packages(include=['restic_compose_backup']), install_requires=[ - 'docker==4.1.*', + # 'docker==4.1.*', + 'docker~=6.0.0', ], entry_points={'console_scripts': [ 'restic-compose-backup = restic_compose_backup.cli:main',