Fix dockerfile & update dependencies

Author: jan-di

.devcontainer/Dockerfile

@@ -1,14 +1,11 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/python-3/.devcontainer/base.Dockerfile
-
-# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
-ARG VARIANT=""
-FROM mcr.microsoft.com/vscode/devcontainers/python:1-${VARIANT}
+# https://github.com/devcontainers/images/tree/main/src/python
+FROM mcr.microsoft.com/vscode/devcontainers/python:3-3.14-trixie
 
 # Add postgresql repository
 RUN set -eu; \
     mkdir -p /etc/apt/keyrings; \
     wget --quiet -O /etc/apt/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc; \
-    sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] https://apt.postgresql.org/pub/repos/apt trixie-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+    sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release --codename --short)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends mariadb-client postgresql-client-18

.devcontainer/devcontainer.json

@@ -2,20 +2,11 @@
 // 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": "..",
-		"args": {
-			// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6, ...
-			// Append -bullseye or -buster to pin to an OS version.
-			// Use -bullseye variants on local on arm64/Apple Silicon.
-			"VARIANT": "3.14-trixie",
-			// Options
-			"NODE_VERSION": "none"
-		}
+		"dockerfile": "Dockerfile"
 	},
 	// Set *default* container specific settings.json values on container create.
 	"customizations": {
@@ -50,10 +41,12 @@
 	// 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",
+	// "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": {}
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+			"moby": "false"
+		}
 	},
-	"remoteUser": "root"
+	// "remoteUser": "root"
 }

Dockerfile

@@ -6,7 +6,7 @@ LABEL jan-di.database-backup.instance_id="default"
 RUN set -eu; \
     mkdir -p /etc/apt/keyrings; \
     wget --quiet -O /etc/apt/keyrings/pgdg.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc; \
-    sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] https://apt.postgresql.org/pub/repos/apt trixie-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+    sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release --codename --short)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
 ENV PYTHONFAULTHANDLER=1 \
     PYTHONUNBUFFERED=1

requirements.in

@@ -1,6 +1,6 @@
 docker~=7.1
-humanize~=4.10
+humanize~=4.15
 requests~=2.32
 pyaescrypt~=6.1
-croniter~=2.0
-tempora~=5.6
+croniter~=6.0
+tempora~=5.8

requirements.txt

@@ -1,46 +1,48 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
 #    pip-compile
 #
-certifi==2024.2.2
+certifi==2026.1.4
     # via requests
-cffi==1.16.0
+cffi==2.0.0
     # via cryptography
-charset-normalizer==3.3.2
+charset-normalizer==3.4.4
     # via requests
-croniter==2.0.7
+croniter==6.0.0
     # via -r requirements.in
-cryptography==42.0.7
+cryptography==46.0.3
     # via pyaescrypt
 docker==7.1.0
     # via -r requirements.in
-humanize==4.10.0
+humanize==4.15.0
     # via -r requirements.in
-idna==3.7
+idna==3.11
     # via requests
-jaraco-functools==4.0.1
+jaraco-functools==4.4.0
     # via tempora
-more-itertools==10.2.0
+more-itertools==10.8.0
     # via jaraco-functools
 pyaescrypt==6.1.1
     # via -r requirements.in
-pycparser==2.22
+pycparser==2.23
     # via cffi
 python-dateutil==2.9.0.post0
+    # via
+    #   croniter
+    #   tempora
+pytz==2025.2
     # via croniter
-pytz==2024.1
-    # via croniter
-requests==2.32.3
+requests==2.32.5
     # via
     #   -r requirements.in
     #   docker
-six==1.16.0
+six==1.17.0
     # via python-dateutil
-tempora==5.6.0
+tempora==5.8.1
     # via -r requirements.in
-urllib3==2.2.1
+urllib3==2.6.3
     # via
     #   docker
     #   requests