Skip to content

Commit 83814d5

Browse files
authored
Merge branch 'master' into 109-move-debian-to-trixie
2 parents 27bb590 + be81948 commit 83814d5

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/updatecli.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Install Updatecli in the runner
17-
uses: updatecli/updatecli-action@v2.89.0
17+
uses: updatecli/updatecli-action@v2.90.0
1818

1919
- name: Run Updatecli in Dry Run mode
2020
run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml

docker-bake.hcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ variable "JAVA21_VERSION" {
7373

7474
variable "DEBIAN_RELEASE" {
7575
default = "trixie-20250811"
76+
default = "bookworm-20250811"
7677
}
7778

7879
# Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function

windows/nanoserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
6060
New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}"
6161

6262
# Install git
63-
ARG GIT_VERSION=2.50.1
63+
ARG GIT_VERSION=2.51.0
6464
ARG GIT_PATCH_VERSION=1
6565
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6666
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)

windows/windowsservercore/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ENV JENKINS_AGENT_WORK=${JENKINS_AGENT_WORK}
5555
USER ContainerAdministrator
5656

5757
# Install git
58-
ARG GIT_VERSION=2.50.1
58+
ARG GIT_VERSION=2.51.0
5959
ARG GIT_PATCH_VERSION=1
6060
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
6161
# The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)

0 commit comments

Comments
 (0)