Skip to content

Commit

Permalink
Merge pull request jenkinsci#431 from jenkinsci/updatecli_master_50c8…
Browse files Browse the repository at this point in the history
…4c1269a8808873a6f33de98c896fe716228392436bfa5a4d0f4d88795f6a

Bump Alpine Linux Version to 3.20.1
  • Loading branch information
dduportal authored Jun 24, 2024
2 parents d1bfd81 + 2165376 commit 6d745e3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# SOFTWARE.

ARG JAVA_VERSION=17.0.11_9
ARG ALPINE_TAG=3.20.0
ARG ALPINE_TAG=3.20.1
FROM alpine:"${ALPINE_TAG}" AS jre-build

SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
Expand Down
28 changes: 14 additions & 14 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ variable "VERSION" {
}

variable "ALPINE_FULL_TAG" {
default = "3.20.0"
default = "3.20.1"
}

variable "ALPINE_SHORT_TAG" {
Expand Down Expand Up @@ -99,7 +99,7 @@ function "javaversion" {
? "${JAVA11_VERSION}"
: (equal(17, jdk)
? "${JAVA17_VERSION}"
: "${JAVA21_VERSION}"))
: "${JAVA21_VERSION}"))
}

## Specific functions
Expand All @@ -108,15 +108,15 @@ function "alpine_platforms" {
params = [jdk]
result = (equal(21, jdk)
? ["linux/amd64", "linux/arm64"]
: ["linux/amd64"])
: ["linux/amd64"])
}

# Return an array of Debian platforms to use depending on the jdk passed as parameter
function "debian_platforms" {
params = [jdk]
result = (equal(17, jdk)
? ["linux/amd64", "linux/arm64", "linux/ppc64le"]
: ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])
: ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])
}

# Return array of Windows version(s) to build
Expand All @@ -129,7 +129,7 @@ function "windowsversions" {
? [WINDOWS_VERSION_OVERRIDE]
: (equal(flavor, "windowsservercore")
? ["ltsc2019", "ltsc2022"]
: ["1809", "ltsc2019", "ltsc2022"]))
: ["1809", "ltsc2019", "ltsc2022"]))
}

# Return the Windows version to use as base image for the Windows version passed as parameter
Expand All @@ -138,7 +138,7 @@ function "toolsversion" {
params = [version]
result = (equal("ltsc2019", version)
? "1809"
: version)
: version)
}

target "alpine" {
Expand Down Expand Up @@ -198,17 +198,17 @@ target "debian" {

target "nanoserver" {
matrix = {
jdk = jdks_to_build
jdk = jdks_to_build
windows_version = windowsversions("nanoserver")
}
name = "nanoserver-${windows_version}_jdk${jdk}"
dockerfile = "windows/nanoserver/Dockerfile"
context = "."
args = {
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
WINDOWS_VERSION_TAG = windows_version
WINDOWS_VERSION_TAG = windows_version
}
tags = [
# If there is a tag, add versioned tag suffixed by the jdk
Expand All @@ -223,17 +223,17 @@ target "nanoserver" {

target "windowsservercore" {
matrix = {
jdk = jdks_to_build
jdk = jdks_to_build
windows_version = windowsversions("windowsservercore")
}
name = "windowsservercore-${windows_version}_jdk${jdk}"
dockerfile = "windows/windowsservercore/Dockerfile"
context = "."
args = {
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
WINDOWS_VERSION_TAG = windows_version
WINDOWS_VERSION_TAG = windows_version
}
tags = [
# If there is a tag, add versioned tag suffixed by the jdk
Expand Down

0 comments on commit 6d745e3

Please sign in to comment.