From 41c95f63286eae427b982df886dd56dee2e323bc Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 20 Apr 2022 10:12:42 -0600 Subject: [PATCH 1/3] Use jenkins/agent:4.13-2 https://github.com/jenkinsci/docker-agent/releases/tag/4.13-2 lists: * fix: enable long paths for git in Windows images (#239) @lemeurherve * Use git lfs 3.1.4, not 3.1.2 (#246) @MarkEWaite * Use Java 17.0.2_8, not 17_35 on Nanoserver (#245) @MarkEWaite * Use git 2.35.3 for Windows (#244) @MarkEWaite * Use remoting 4.13, not 4.12 (#243) @MarkEWaite * Use Alpine 3.15.4, not 3.15.0 (#242) @MarkEWaite * Bump debian from bullseye-20220228 to bullseye-20220328 in /11/bullseye (#237, #240) @dependabot * Bump debian from bullseye-20220228 to bullseye-20220328 in /8/bullseye (#236, #241) @dependabot --- docker-bake.hcl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 98bdebd4..35b186a5 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -24,9 +24,9 @@ group "linux-ppc64le" { targets = [] } -# update this to use a newer build number for jenkins/docker-agent image +# update this to use a newer build number of the jenkins/agent image variable "AGENT_IMAGE_BUILD_NUMBER" { - default = "1" + default = "2" } variable "REGISTRY" { @@ -41,8 +41,9 @@ variable "REMOTING_VERSION" { default = "4.13" } +# Used in the tag pushed to the jenkins/inbound-agent image variable "BUILD_NUMBER" { - default = "1" + default = "2" } variable "ON_TAG" { From ad4ab0c1d86dda7621edf382ed9fe9d454153d80 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 20 Apr 2022 10:43:33 -0600 Subject: [PATCH 2/3] Clarify build number comment Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 35b186a5..76593986 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -41,7 +41,7 @@ variable "REMOTING_VERSION" { default = "4.13" } -# Used in the tag pushed to the jenkins/inbound-agent image +# Used in the tag pushed to the jenkins/inbound-agent image, no need to update this the pipeline will change it variable "BUILD_NUMBER" { default = "2" } From 80b73fd5e89bb601eaca299fdb782b2a6018bdfb Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 20 Apr 2022 10:44:59 -0600 Subject: [PATCH 3/3] Don't need to change BUILD_NUMBER Pipeline will compute it based on tag string --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 76593986..8e9070cb 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -43,7 +43,7 @@ variable "REMOTING_VERSION" { # Used in the tag pushed to the jenkins/inbound-agent image, no need to update this the pipeline will change it variable "BUILD_NUMBER" { - default = "2" + default = "1" } variable "ON_TAG" {