diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 645173f..2d84bb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ build-images: - node-debian-24-trixie-slim - node-debian-25-trixie-slim - python-debian-3-14-slim-trixie + - python-debian-3-13-slim-trixie - gradle-rhel-jdk25-ubi10 - eclipse-temurin-rhel-25-jre-ubi10-minimal - gradle-rhel-jdk17-ubi10 diff --git a/Dockerfile.python-deb b/Dockerfile.python-deb index 07e3db7..3895d67 100644 --- a/Dockerfile.python-deb +++ b/Dockerfile.python-deb @@ -9,5 +9,3 @@ COPY apt/99ca /etc/apt/apt.conf.d/99ca COPY apt/debian.sources /etc/apt/sources.list.d/debian.sources COPY python/pip.conf /etc/pip.conf - -RUN update-ca-certificates diff --git a/README.md b/README.md index 627b98b..c963b25 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## Собираемые образы - Node 24, 25 (Debian) -- Python 3.14 (Debian) +- Python 3.14, 3.13 (Debian) - Java 17, 25 JRE Eclipse Temurin (RHEL) - Java 17, 25 JDK Eclipse Temurin Gradle (RHEL) diff --git a/docker-bake.hcl b/docker-bake.hcl index e840188..e89ff1d 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -26,7 +26,7 @@ function "image_ref" { target "image" { name = join("-", compact([ combo.image, - combo.distro, + replace(combo.distro, ".", "-"), replace(combo.version, ".", "-") ])) @@ -35,6 +35,7 @@ target "image" { { image = "node", distro= "debian", version = "25-trixie-slim", dockerfile="Dockerfile.node-deb" }, { image = "node", distro= "debian", version = "24-trixie-slim", dockerfile="Dockerfile.node-deb" }, { image = "python", distro= "debian", version = "3.14-slim-trixie", dockerfile="Dockerfile.python-deb" }, + { image = "python", distro= "debian", version = "3.13-slim-trixie", dockerfile="Dockerfile.python-deb" }, { image = "eclipse-temurin", distro= "rhel", version = "25-jre-ubi10-minimal", dockerfile="Dockerfile.jre-rhel" }, { image = "gradle", distro= "rhel", version = "jdk25-ubi10", dockerfile="Dockerfile.jdk-rhel" }, { image = "eclipse-temurin", distro= "rhel", version = "17-jre-ubi10-minimal", dockerfile="Dockerfile.jre-rhel" },