diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 543c01f..62f5005 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,9 @@ build-images: parallel: matrix: - BAKE_TARGET: - - images-node-debian - - images-python-debian + - node-debian-24-trixie-slim + - node-debian-25-trixie-slim + - python-debian-3-14-slim-trixie script: - echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY - docker bake "$BAKE_TARGET" --no-cache --push diff --git a/README.md b/README.md index d1805e5..b5c6a19 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ ## Собираемые образы -- Node (Debian) -- Python (Debian) +- Node 24, 25 (Debian) +- Python 3.14 (Debian) ## Сборка diff --git a/docker-bake.hcl b/docker-bake.hcl index 4f11ee1..9492cbd 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -24,11 +24,12 @@ function "image_ref" { } target "image" { - name = "images-${combo.image}-${combo.distro}" + name = "${combo.image}-${combo.distro}-${replace(combo.version, ".", "-")}" matrix = { combo = [ { 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" } ] }