From 2f5636a84d8b851f552da4a4054d488bfc2b3866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A1=D1=8B=D1=87?= =?UTF-8?q?=D0=B5=D0=B2?= Date: Thu, 18 Dec 2025 17:30:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20JAVA=2017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 3 +++ README.md | 4 ++-- docker-bake.hcl | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcc09e1..0d2de11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,9 @@ build-images: - python-debian-3-14-slim-trixie - gradle-rhel-jdk25-ubi10 - eclipse-temurin-rhel-25-jre-ubi10-minimal + - gradle-rhel-jdk17-ubi10 + - eclipse-temurin-rhel-17-jre-ubi10-minimal + 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 6c8f5d9..627b98b 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ - Node 24, 25 (Debian) - Python 3.14 (Debian) -- Java 25 JRE Eclipse Temurin (RHEL) -- Java 25 JDK Eclipse Temurin Gradle (RHEL) +- 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 7493284..764f2ff 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -32,7 +32,9 @@ target "image" { { 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 = "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 = "gradle", distro= "rhel", version = "jdk25-ubi10", dockerfile="Dockerfile.jdk-rhel" }, + { image = "eclipse-temurin", distro= "rhel", version = "17-jre-ubi10-minimal", dockerfile="Dockerfile.jre-rhel" }, + { image = "gradle", distro= "rhel", version = "jdk17-ubi10", dockerfile="Dockerfile.jdk-rhel" } ] }