Merge 936089ee99 into b52655a23b

docker-compose.yaml

@@ -4,7 +4,7 @@ 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'
@@ -32,7 +32,7 @@ services:
       - SOME_VALUE=test
       - ANOTHER_VALUE=1
 
-  mysql5:
+  mysql:
     image: mysql:5
     labels:
       restic-compose-backup.mysql: true
@@ -42,19 +42,7 @@ services:
       - MYSQL_USER=myuser
       - MYSQL_PASSWORD=mypassword
     volumes:
-      - mysqldata5:/var/lib/mysql
-
-  mysql8:
-    image: mysql:8
-    labels:
-      restic-compose-backup.mysql: true
-    environment:
-      - MYSQL_ROOT_PASSWORD=my-secret-pw
-      - MYSQL_DATABASE=mydb
-      - MYSQL_USER=myuser
-      - MYSQL_PASSWORD=mypassword
-    volumes:
-      - mysqldata8:/var/lib/mysql
+      - mysqldata:/var/lib/mysql
 
   mariadb:
     image: mariadb:10
@@ -80,8 +68,7 @@ services:
       - pgdata:/var/lib/postgresql/data
 
 volumes:
-  mysqldata5:
-  mysqldata8:
+  mysqldata:
   mariadbdata:
   pgdata:
 

src/Dockerfile

@@ -1,10 +1,6 @@
 FROM restic/restic:0.9.6
 
-RUN apk update && apk add python3 \ 
-    dcron \
-    mariadb-client \
-    postgresql-client \
-    mariadb-connector-c-dev 
+RUN apk update && apk add python3 dcron mariadb-client postgresql-client
 
 ADD . /restic-compose-backup
 WORKDIR /restic-compose-backup

src/restic_compose_backup/containers_db.py

@@ -40,7 +40,6 @@ class MariadbContainer(Container):
             "mysqldump",
             f"--user={creds['username']}",
             "--all-databases",
-            "--no-tablespaces",
         ]
 
     def backup(self):
@@ -102,7 +101,6 @@ class MysqlContainer(Container):
             "mysqldump",
             f"--user={creds['username']}",
             "--all-databases",
-            "--no-tablespaces",
         ]
 
     def backup(self):

src/setup.py

@@ -3,15 +3,12 @@ from setuptools import setup, find_namespace_packages
 setup(
     name="restic-compose-backup",
     url="https://github.com/ZettaIO/restic-compose-backup",
-    version="0.7.0",
+    version="0.6.0",
     author="Einar Forselv",
     author_email="eforselv@gmail.com",
-    packages=find_namespace_packages(include=[
-        'restic_compose_backup',
-        'restic_compose_backup.*',
-    ]),
+    packages=find_namespace_packages(include=['restic_compose_backup']),
     install_requires=[
-        'docker~=6.1.3',
+        'docker==4.1.*',
     ],
     entry_points={'console_scripts': [
         'restic-compose-backup = restic_compose_backup.cli:main',