1
0

Compare commits

...

3 Commits

Author SHA1 Message Date
6f2dc19d07 j2cfg: update requirements 2025-08-14 12:05:33 +03:00
49a522bf15 image: update certifi 2025-08-14 12:04:41 +03:00
b332ed833e image: switch to Debian 13 "Trixie"
NB: Angie repository for Debian 13 is coming soon.
2025-08-14 12:04:17 +03:00
5 changed files with 9 additions and 36 deletions

View File

@@ -1,5 +1,5 @@
# FROM docker.io/debian:bookworm-slim as base-upstream
ARG PYTHONTAG=3.12.11-slim-bookworm
# FROM docker.io/debian:trixie-slim as base-upstream
ARG PYTHONTAG=3.12.11-slim-trixie
FROM docker.io/python:${PYTHONTAG} AS base-upstream
FROM base-upstream AS base-intermediate
@@ -19,7 +19,6 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin \
PYTHONUNBUFFERED=1 \
PYTHONDONTWRITEBYTECODE=1
COPY /apt/prefs.backports /etc/apt/preferences.d/backports
COPY /apt/sources.debian /etc/apt/sources.list.d/debian.sources
## prevent services from auto-starting, part 1
@@ -60,6 +59,7 @@ RUN apt-env.sh apt-get update ; \
openssl \
procps \
psmisc \
systemd-standalone-sysusers \
tzdata \
zstd \
; \
@@ -272,8 +272,8 @@ RUN env -C /root rm -f .bash_history .python_history .wget-hsts
FROM base-intermediate AS certs
SHELL [ "/bin/sh", "-ec" ]
## "2025.06.15"
ENV CERTIFI_COMMIT=e767d5938eddddf804216cec93a55c85129c5f2d
## "2025.08.03"
ENV CERTIFI_COMMIT=a97d9ad8f87c382378dddc0b0b33b9770932404e
# ARG CERTIFI_BASE_URI='https://raw.githubusercontent.com/certifi/python-certifi'

View File

@@ -1,27 +0,0 @@
Package: src:curl
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:debhelper
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:elfutils
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:iproute2
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:libbpf
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:systemd
Pin: release n=bookworm-backports
Pin-Priority: 600
Package: src:sysvinit
Pin: release n=bookworm-backports
Pin-Priority: 600

View File

@@ -1,11 +1,11 @@
Types: deb
URIs: http://deb.debian.org/debian
Suites: bookworm bookworm-updates bookworm-proposed-updates bookworm-backports
Suites: trixie trixie-updates trixie-proposed-updates trixie-backports
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
Types: deb
URIs: http://deb.debian.org/debian-security
Suites: bookworm-security
Suites: trixie-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

View File

@@ -10,7 +10,7 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
set +a
PYTHONTAG="${PYTHONTAG:-3.12.11-slim-bookworm}"
PYTHONTAG="${PYTHONTAG:-3.12.11-slim-trixie}"
grab_site_packages() {
podman run \

View File

@@ -1,4 +1,4 @@
jinja2==3.1.6
psutil==7.0.0
pyyaml==6.0.2
wcmatch==10.0
wcmatch==10.1