Skip to content

Commit

Permalink
Merge pull request #947 from jenkinsci/updatecli_master_20863217c1acd…
Browse files Browse the repository at this point in the history
…a5d7d19ed8cdce74e32a81b31d946e6c3e439bcd0d0f573f0dd

Bump Debian Bookworm Linux version to bookworm-20250224
  • Loading branch information
dduportal authored Mar 5, 2025
2 parents 9187c83 + 1211a48 commit 8ddf19d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
ARG DEBIAN_RELEASE=bookworm-20250203
ARG DEBIAN_RELEASE=bookworm-20250224
FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build

SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
Expand Down
24 changes: 12 additions & 12 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ variable "ALPINE_SHORT_TAG" {
}

variable "DEBIAN_RELEASE" {
default = "bookworm-20250203"
default = "bookworm-20250224"
}

variable "UBI9_TAG" {
Expand Down Expand Up @@ -199,31 +199,31 @@ function distribution_prefix {
params = [distribution]
result = (equal("debian", distribution)
? ""
: "${distribution}-")
: "${distribution}-")
}

# Return a dash followed by the distribution if it is not the default distribution
function distribution_suffix {
params = [distribution]
result = (equal("debian", distribution)
? ""
: "-${distribution}")
: "-${distribution}")
}

# Return the official name of the default distribution
function distribution_name {
params = [distribution]
result = (equal("debian", distribution)
? "bookworm"
: distribution)
: distribution)
}

# Return the tag suffixed by "-preview" if the jdk passed as parameter is in the jdks_in_preview list
function preview_tag {
params = [jdk]
result = (contains(jdks_in_preview, jdk)
? "${jdk}-preview"
: jdk)
: jdk)
}

# Return an array of tags depending on the agent type, the jdk and the Linux distribution passed as parameters
Expand Down Expand Up @@ -279,7 +279,7 @@ target "alpine" {
VERSION = REMOTING_VERSION
JAVA_VERSION = "${javaversion(jdk)}"
}
tags = concat(linux_tags(type, jdk, "alpine"), linux_tags(type, jdk, "alpine${ALPINE_SHORT_TAG}"))
tags = concat(linux_tags(type, jdk, "alpine"), linux_tags(type, jdk, "alpine${ALPINE_SHORT_TAG}"))
platforms = alpine_platforms(jdk)
}

Expand All @@ -297,7 +297,7 @@ target "debian" {
DEBIAN_RELEASE = DEBIAN_RELEASE
JAVA_VERSION = "${javaversion(jdk)}"
}
tags = linux_tags(type, jdk, "debian")
tags = linux_tags(type, jdk, "debian")
platforms = debian_platforms(jdk)
}

Expand All @@ -315,7 +315,7 @@ target "rhel_ubi9" {
VERSION = REMOTING_VERSION
JAVA_VERSION = "${javaversion(jdk)}"
}
tags = linux_tags(type, jdk, "rhel-ubi9")
tags = linux_tags(type, jdk, "rhel-ubi9")
platforms = rhel_ubi9_platforms(jdk)
}

Expand All @@ -335,8 +335,8 @@ target "nanoserver" {
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
}
target = type
tags = windows_tags(type, jdk, "nanoserver-${windows_version}")
target = type
tags = windows_tags(type, jdk, "nanoserver-${windows_version}")
platforms = ["windows/amd64"]
}

Expand All @@ -356,7 +356,7 @@ target "windowsservercore" {
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
}
target = type
tags = windows_tags(type, jdk, "windowsservercore-${windows_version}")
target = type
tags = windows_tags(type, jdk, "windowsservercore-${windows_version}")
platforms = ["windows/amd64"]
}

0 comments on commit 8ddf19d

Please sign in to comment.