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 Debian Bookworm Linux version to bookworm-20240926 #886

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Bump Debian Bookworm Linux version to bookworm-20240926 #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb33aa6
chore: Update the value of the base image (ARG DEBIAN_RELEASE) in the...
github-actions[bot] Sep 30, 2024
d15f47b
chore: Update the default value of the variable DEBIAN_RELEASE in the...
github-actions[bot] Sep 30, 2024
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
2 changes: 1 addition & 1 deletion debian/Dockerfile
View file
Open in desktop
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-20240904
ARG DEBIAN_RELEASE=bookworm-20240926
FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build

SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
Expand Down
42 changes: 21 additions & 21 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ variable "ALPINE_SHORT_TAG" {
}

variable "DEBIAN_RELEASE" {
default = "bookworm-20240904"
default = "bookworm-20240926"
}

variable "UBI9_TAG" {
Expand Down Expand Up @@ -200,7 +200,7 @@ function "windowsversions" {
? [WINDOWS_VERSION_OVERRIDE]
: (equal(flavor, "windowsservercore")
? ["ltsc2019", "ltsc2022"]
: ["1809", "ltsc2019", "ltsc2022"]))
: ["1809", "ltsc2019", "ltsc2022"]))
}

# Return array of agent type(s) to build
Expand All @@ -209,7 +209,7 @@ function "windowsagenttypes" {
params = [override]
result = (notequal(override, "")
? [override]
: agent_types_to_build)
: agent_types_to_build)
}

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

# Return an array of RHEL UBI 9 platforms to use depending on the jdk passed as parameter
Expand Down Expand Up @@ -321,9 +321,9 @@ target "rhel_ubi9" {
dockerfile = "rhel/ubi9/Dockerfile"
context = "."
args = {
UBI9_TAG = UBI9_TAG
VERSION = REMOTING_VERSION
JAVA_VERSION = "${javaversion(jdk)}"
UBI9_TAG = UBI9_TAG
VERSION = REMOTING_VERSION
JAVA_VERSION = "${javaversion(jdk)}"
}
tags = [
# If there is a tag, add versioned tag suffixed by the jdk
Expand All @@ -341,19 +341,19 @@ target "rhel_ubi9" {

target "nanoserver" {
matrix = {
type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
jdk = jdks_to_build
type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
jdk = jdks_to_build
windows_version = windowsversions("nanoserver")
}
name = "${type}_nanoserver-${windows_version}_jdk${jdk}"
dockerfile = "windows/nanoserver/Dockerfile"
context = "."
args = {
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
}
target = type
tags = [
Expand All @@ -369,19 +369,19 @@ target "nanoserver" {

target "windowsservercore" {
matrix = {
type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
jdk = jdks_to_build
type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
jdk = jdks_to_build
windows_version = windowsversions("windowsservercore")
}
name = "${type}_windowsservercore-${windows_version}_jdk${jdk}"
dockerfile = "windows/windowsservercore/Dockerfile"
context = "."
args = {
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
JAVA_HOME = "C:/openjdk-${jdk}"
JAVA_VERSION = "${replace(javaversion(jdk), "_", "+")}"
TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
VERSION = REMOTING_VERSION
WINDOWS_VERSION_TAG = windows_version
}
target = type
tags = [
Expand Down