Merge branch 'lawndoc:main' into chore/remove-docker-compose-version

igolman · web-flow · commit e62bc5b58a03 · 2025-06-03T10:36:24.000+02:00
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-# stack-back
+![stack-back logo](./resources/stack-back_logo.svg)
 
 [![docs](https://readthedocs.org/projects/stack-back/badge/?version=latest)](https://stack-back.readthedocs.io)
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -52,10 +52,10 @@ services:
     labels:
       stack-back.mariadb: true
     environment:
-      - MYSQL_ROOT_PASSWORD=my-secret-pw
-      - MYSQL_DATABASE=mydb
-      - MYSQL_USER=myuser
-      - MYSQL_PASSWORD=mypassword
+      - MARIADB_ROOT_PASSWORD=my-secret-pw
+      - MARIADB_DATABASE=mydb
+      - MARIADB_USER=myuser
+      - MARIADB_PASSWORD=mypassword
     volumes:
       - mariadbdata:/var/lib/mysql
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Zetta.IO Technology AS'
 
 # The full version, including alpha/beta/rc tags
-release = "0.0.1"
+release = "1.4.2"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/resources/stack-back_logo.svg b/resources/stack-back_logo.svg
@@ -0,0 +1,23 @@
+
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 760 120">
+    <!-- No background rect for transparency -->
+
+    <!-- Stack of containers/volumes on the left -->
+    <rect x="40" y="77.5" width="60" height="30" rx="5" ry="5" fill="#3498db"/>
+    <rect x="40" y="47.5" width="60" height="30" rx="5" ry="5" fill="#2980b9"/>
+    <rect x="40" y="17.5" width="60" height="30" rx="5" ry="5" fill="#1f618d"/>
+
+    <!-- Left-pointing arrow (backup/restore concept) -->
+    <polygon points="120,62.5 150,32.5 150,52.5 180,52.5 180,72.5 150,72.5 150,92.5" fill="#e74c3c"/>
+
+    <!-- Text "stack-back" -->
+    <text x="200" y="82.5" font-family="Arial, sans-serif" font-size="70" font-weight="bold" fill="#666666">stack-back</text>
+
+    <!-- Right-pointing arrow (restore/destination concept) -->
+    <polygon points="580,62.5 610,32.5 610,52.5 640,52.5 640,72.5 610,72.5 610,92.5" fill="#e74c3c"/>
+
+    <!-- Second stack of containers/volumes on the right -->
+    <rect x="660" y="77.5" width="60" height="30" rx="5" ry="5" fill="#3498db"/>
+    <rect x="660" y="47.5" width="60" height="30" rx="5" ry="5" fill="#2980b9"/>
+    <rect x="660" y="17.5" width="60" height="30" rx="5" ry="5" fill="#1f618d"/>
+  </svg>
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM restic/restic:0.18.0
+FROM restic/restic:0.17.3
 
 RUN apk update && apk add \
     python3 \
diff --git a/src/pyproject.toml b/src/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "restic_compose_backup"
-version = "0.0.1"
+version = "1.4.2"
 description = "Backup Docker Compose volumes and databases with Restic"
 requires-python = ">=3.12"
 dependencies = [
diff --git a/src/restic_compose_backup/__init__.py b/src/restic_compose_backup/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.1"
+__version__ = "1.4.2"
diff --git a/src/restic_compose_backup/backup_runner.py b/src/restic_compose_backup/backup_runner.py
@@ -53,7 +53,7 @@ def readlines(stream):
         for line in readlines(log_generator):
             fd.write(line)
             fd.write('\n')
-            logger.info(line)
+            print(line)
 
     container.wait()
     container.reload()
diff --git a/src/uv.lock b/src/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-# stack-back`
	`2`	`+![stack-back logo](./resources/stack-back_logo.svg)`
`3`	`3`
`4`	`4`	`[![docs](https://readthedocs.org/projects/stack-back/badge/?version=latest)](https://stack-back.readthedocs.io)`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM restic/restic:0.18.0`
	`1`	`+FROM restic/restic:0.17.3`
`2`	`2`
`3`	`3`	`RUN apk update && apk add \`
`4`	`4`	`python3 \`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "0.0.1"`
	`1`	`+__version__ = "1.4.2"`