Skip to content

Commit 8ddf19d

Browse files
authored
Merge pull request #947 from jenkinsci/updatecli_master_20863217c1acda5d7d19ed8cdce74e32a81b31d946e6c3e439bcd0d0f573f0dd
Bump Debian Bookworm Linux version to bookworm-20250224
2 parents 9187c83 + 1211a48 commit 8ddf19d

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

debian/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
# THE SOFTWARE.
22-
ARG DEBIAN_RELEASE=bookworm-20250203
22+
ARG DEBIAN_RELEASE=bookworm-20250224
2323
FROM debian:"${DEBIAN_RELEASE}"-slim as jre-build
2424

2525
SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]

docker-bake.hcl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ variable "ALPINE_SHORT_TAG" {
101101
}
102102

103103
variable "DEBIAN_RELEASE" {
104-
default = "bookworm-20250203"
104+
default = "bookworm-20250224"
105105
}
106106

107107
variable "UBI9_TAG" {
@@ -199,31 +199,31 @@ function distribution_prefix {
199199
params = [distribution]
200200
result = (equal("debian", distribution)
201201
? ""
202-
: "${distribution}-")
202+
: "${distribution}-")
203203
}
204204

205205
# Return a dash followed by the distribution if it is not the default distribution
206206
function distribution_suffix {
207207
params = [distribution]
208208
result = (equal("debian", distribution)
209209
? ""
210-
: "-${distribution}")
210+
: "-${distribution}")
211211
}
212212

213213
# Return the official name of the default distribution
214214
function distribution_name {
215215
params = [distribution]
216216
result = (equal("debian", distribution)
217217
? "bookworm"
218-
: distribution)
218+
: distribution)
219219
}
220220

221221
# Return the tag suffixed by "-preview" if the jdk passed as parameter is in the jdks_in_preview list
222222
function preview_tag {
223223
params = [jdk]
224224
result = (contains(jdks_in_preview, jdk)
225225
? "${jdk}-preview"
226-
: jdk)
226+
: jdk)
227227
}
228228

229229
# Return an array of tags depending on the agent type, the jdk and the Linux distribution passed as parameters
@@ -279,7 +279,7 @@ target "alpine" {
279279
VERSION = REMOTING_VERSION
280280
JAVA_VERSION = "${javaversion(jdk)}"
281281
}
282-
tags = concat(linux_tags(type, jdk, "alpine"), linux_tags(type, jdk, "alpine${ALPINE_SHORT_TAG}"))
282+
tags = concat(linux_tags(type, jdk, "alpine"), linux_tags(type, jdk, "alpine${ALPINE_SHORT_TAG}"))
283283
platforms = alpine_platforms(jdk)
284284
}
285285

@@ -297,7 +297,7 @@ target "debian" {
297297
DEBIAN_RELEASE = DEBIAN_RELEASE
298298
JAVA_VERSION = "${javaversion(jdk)}"
299299
}
300-
tags = linux_tags(type, jdk, "debian")
300+
tags = linux_tags(type, jdk, "debian")
301301
platforms = debian_platforms(jdk)
302302
}
303303

@@ -315,7 +315,7 @@ target "rhel_ubi9" {
315315
VERSION = REMOTING_VERSION
316316
JAVA_VERSION = "${javaversion(jdk)}"
317317
}
318-
tags = linux_tags(type, jdk, "rhel-ubi9")
318+
tags = linux_tags(type, jdk, "rhel-ubi9")
319319
platforms = rhel_ubi9_platforms(jdk)
320320
}
321321

@@ -335,8 +335,8 @@ target "nanoserver" {
335335
VERSION = REMOTING_VERSION
336336
WINDOWS_VERSION_TAG = windows_version
337337
}
338-
target = type
339-
tags = windows_tags(type, jdk, "nanoserver-${windows_version}")
338+
target = type
339+
tags = windows_tags(type, jdk, "nanoserver-${windows_version}")
340340
platforms = ["windows/amd64"]
341341
}
342342

@@ -356,7 +356,7 @@ target "windowsservercore" {
356356
VERSION = REMOTING_VERSION
357357
WINDOWS_VERSION_TAG = windows_version
358358
}
359-
target = type
360-
tags = windows_tags(type, jdk, "windowsservercore-${windows_version}")
359+
target = type
360+
tags = windows_tags(type, jdk, "windowsservercore-${windows_version}")
361361
platforms = ["windows/amd64"]
362362
}

0 commit comments

Comments
 (0)