Fix requests issue with docker sdkm update mariadb tests

Signed-off-by: Jan Dittrich <[email protected]>

.devcontainer/devcontainer.json

@@ -2,7 +2,9 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/python-3
 {
 	"name": "Python 3",
-	"runArgs": ["--init"],
+	"runArgs": [
+		"--init"
+	],
 	"build": {
 		"dockerfile": "Dockerfile",
 		"context": "..",
@@ -15,12 +17,11 @@
 			"NODE_VERSION": "none"
 		}
 	},
-
 	// Set *default* container specific settings.json values on container create.
 	"customizations": {
 		"vscode": {
 			"settings": {
-				"editor.formatOnSave":true,
+				"editor.formatOnSave": true,
 				"python.pythonPath": "/usr/local/bin/python",
 				"python.languageServer": "Pylance",
 				"python.linting.enabled": true,
@@ -46,16 +47,13 @@
 			],
 		}
 	},
-
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "pip-sync",
-
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"features": {
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
-	}
-}
+	},
+	"remoteUser": "root"
+}

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated dependencies
 - Use upstream apt repository of postgresql instead of the debian one.
 - Switch from debian bullseye to debian bookworm
+- Switch from python 3.9 to python 3.12
 
 ### Removed
 

requirements.in

@@ -1,6 +1,6 @@
-docker~=6.1
+docker~=7.1
 humanize~=4.9
-requests~=2.31
+requests~=2.32
 pyaescrypt~=6.1
 croniter~=2.0
 tempora~=5.5

requirements.txt

@@ -14,7 +14,7 @@ croniter==2.0.5
     # via -r requirements.in
 cryptography==42.0.7
     # via pyaescrypt
-docker==6.1.3
+docker==7.1.0
     # via -r requirements.in
 humanize==4.9.0
     # via -r requirements.in
@@ -24,8 +24,6 @@ jaraco-functools==4.0.1
     # via tempora
 more-itertools==10.2.0
     # via jaraco-functools
-packaging==24.0
-    # via docker
 pyaescrypt==6.1.1
     # via -r requirements.in
 pycparser==2.22
@@ -48,5 +46,3 @@ urllib3==2.2.1
     # via
     #   docker
     #   requests
-websocket-client==1.8.0
-    # via docker

tests/all.docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   db-encrypt-compress:
-    image: docker.io/mariadb:10.10
+    image: docker.io/mariadb:11.14 # current LTS
     environment:
       MARIADB_ROOT_PASSWORD: secret
     labels:

tests/mariadb.docker-compose.yml

@@ -1,5 +1,4 @@
-x-mariadb:
-  &x-mariadb
+x-mariadb: &x-mariadb
   environment:
     MARIADB_ROOT_PASSWORD: secret
   labels:
@@ -10,10 +9,6 @@ x-mariadb:
 services:
   # All currently supported versions. See https://endoflife.date/mariadb
 
-  docker-database-backup-mariadb-10-3:
-    <<: *x-mariadb
-    image: docker.io/mariadb:10.3
-
   docker-database-backup-mariadb-10-4:
     <<: *x-mariadb
     image: docker.io/mariadb:10.4
@@ -26,18 +21,22 @@ services:
     <<: *x-mariadb
     image: docker.io/mariadb:10.6
 
-  docker-database-backup-mariadb-10-7:
+  docker-database-backup-mariadb-10-11:
+    <<: *x-mariadb
+    image: docker.io/mariadb:10.11
+
+  docker-database-backup-mariadb-11-1:
     <<: *x-mariadb
-    image: docker.io/mariadb:10.7
+    image: docker.io/mariadb:11.1
 
-  docker-database-backup-mariadb-10-8:
+  docker-database-backup-mariadb-11-2:
     <<: *x-mariadb
-    image: docker.io/mariadb:10.8
+    image: docker.io/mariadb:11.2
 
-  docker-database-backup-mariadb-10-9:
+  docker-database-backup-mariadb-11-3:
     <<: *x-mariadb
-    image: docker.io/mariadb:10.9
+    image: docker.io/mariadb:11.3
 
-  docker-database-backup-mariadb-10-10:
+  docker-database-backup-mariadb-11-4:
     <<: *x-mariadb
-    image: docker.io/mariadb:10.10
+    image: docker.io/mariadb:11.4