Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump JDK21 preview version (EA) to 21.0.1+12 #1743

Merged
merged 3 commits into from
Oct 22, 2023
Merged

Bump JDK21 preview version (EA) to 21.0.1+12 #1743

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d08d41
chore: Bump JDK21 preview version (EA) for Linux images in the docker...
github-actions[bot] Oct 20, 2023
c456263
Merge branch 'master' into updatecli_58dc4aa87938c6ff9daa5d4fa6b764c9…
lemeurherve Oct 22, 2023
2828ddb
Merge branch 'master' into updatecli_58dc4aa87938c6ff9daa5d4fa6b764c9…
lemeurherve Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 94 additions & 94 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ variable "JAVA17_VERSION" {
# not passed through currently as inconsistent versions are published (2023-08-14)
# alpine not published on 34, but x64 on 35 isn't published for linux
variable "JAVA21_PREVIEW_VERSION" {
default = "21+35"
default = "21.0.1+12"
}

variable "JAVA21_VERSION" {
Expand Down Expand Up @@ -129,26 +129,26 @@ function "tag" {
# return a weekly optionaly prefixed by the Jenkins version
function "tag_weekly" {
params = [prepend_jenkins_version, tag]
result = equal(LATEST_WEEKLY, "true") ? tag(prepend_jenkins_version, tag) : ""
result = equal(LATEST_WEEKLY, "true") ? tag(prepend_jenkins_version, tag) : ""
}

# return a LTS optionaly prefixed by the Jenkins version
function "tag_lts" {
params = [prepend_jenkins_version, tag]
result = equal(LATEST_LTS, "true") ? tag(prepend_jenkins_version, tag) : ""
result = equal(LATEST_LTS, "true") ? tag(prepend_jenkins_version, tag) : ""
}

# ---- targets ----

target "almalinux_jdk11" {
dockerfile = "11/almalinux/almalinux8/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA11_VERSION
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "almalinux"),
Expand All @@ -160,14 +160,14 @@ target "almalinux_jdk11" {

target "alpine_jdk11" {
dockerfile = "11/alpine/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA11_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "alpine-jdk11"),
Expand All @@ -180,14 +180,14 @@ target "alpine_jdk11" {

target "alpine_jdk17" {
dockerfile = "17/alpine/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA17_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA17_VERSION
}
tags = [
tag(true, "alpine"),
Expand All @@ -203,14 +203,14 @@ target "alpine_jdk17" {

target "alpine_jdk21" {
dockerfile = "21/alpine/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA21_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
JAVA_VERSION = JAVA21_VERSION
}
tags = [
tag(true, "alpine-jdk21"),
Expand All @@ -223,13 +223,13 @@ target "alpine_jdk21" {

target "centos7_jdk11" {
dockerfile = "11/centos/centos7/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA11_VERSION
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "centos7"),
Expand All @@ -244,14 +244,14 @@ target "centos7_jdk11" {

target "debian_jdk11" {
dockerfile = "11/debian/bookworm/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA11_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "jdk11"),
Expand All @@ -265,14 +265,14 @@ target "debian_jdk11" {

target "debian_jdk17" {
dockerfile = "17/debian/bookworm/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA17_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA17_VERSION
}
tags = [
tag(true, ""),
Expand All @@ -290,14 +290,14 @@ target "debian_jdk17" {

target "debian_jdk21" {
dockerfile = "21/debian/bookworm/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_VERSION
}
tags = [
tag(true, "jdk21"),
Expand All @@ -313,14 +313,14 @@ target "debian_jdk21" {

target "debian_jdk21_preview" {
dockerfile = "21/debian/bookworm/hotspot/preview/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_PREVIEW_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_PREVIEW_VERSION
}
tags = [
tag(true, "jdk21-preview"),
Expand All @@ -334,14 +334,14 @@ target "debian_jdk21_preview" {

target "debian_slim_jdk11" {
dockerfile = "11/debian/bookworm-slim/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA11_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "slim-jdk11"),
Expand All @@ -353,14 +353,14 @@ target "debian_slim_jdk11" {

target "debian_slim_jdk17" {
dockerfile = "17/debian/bookworm-slim/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA17_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA17_VERSION
}
tags = [
tag(true, "slim"),
Expand All @@ -375,14 +375,14 @@ target "debian_slim_jdk17" {

target "debian_slim_jdk21" {
dockerfile = "21/debian/bookworm-slim/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_VERSION
}
tags = [
tag(true, "slim-jdk21"),
Expand All @@ -394,14 +394,14 @@ target "debian_slim_jdk21" {

target "debian_slim_jdk21_preview" {
dockerfile = "21/debian/bookworm-slim/hotspot/preview/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_PREVIEW_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
JAVA_VERSION = JAVA21_PREVIEW_VERSION
}
tags = [
tag(true, "slim-jdk21-preview"),
Expand All @@ -413,13 +413,13 @@ target "debian_slim_jdk21_preview" {

target "rhel_ubi8_jdk11" {
dockerfile = "11/rhel/ubi8/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA11_VERSION
JAVA_VERSION = JAVA11_VERSION
}
tags = [
tag(true, "rhel-ubi8-jdk11"),
Expand All @@ -432,13 +432,13 @@ target "rhel_ubi8_jdk11" {

target "rhel_ubi9_jdk17" {
dockerfile = "17/rhel/ubi9/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA17_VERSION
JAVA_VERSION = JAVA17_VERSION
}
tags = [
tag(true, "rhel-ubi9-jdk17"),
Expand All @@ -451,13 +451,13 @@ target "rhel_ubi9_jdk17" {

target "rhel_ubi9_jdk21" {
dockerfile = "21/rhel/ubi9/hotspot/Dockerfile"
context = "."
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
JENKINS_VERSION = JENKINS_VERSION
JENKINS_SHA = JENKINS_SHA
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA21_PREVIEW_VERSION
JAVA_VERSION = JAVA21_PREVIEW_VERSION
}
tags = [
tag(true, "rhel-ubi9-jdk21-preview"),
Expand Down