Merge branch 'master' into agent/to/arm64

smerle33 · Jan 9, 2024 · 3f2cac0 · 3f2cac0
2 parents aab6951 + 4b8165a
commit 3f2cac0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/resources/io/jenkins/infra/docker/Makefile b/resources/io/jenkins/infra/docker/Makefile
@@ -76,6 +76,7 @@ build: ## Build the Docker Image $(IMAGE_NAME) from $(IMAGE_DOCKERFILE)
 
 bake-build: ## Build the Docker Image(s) with dockerbake file
 	@echo "== Building from DockerBake file $(DOCKER_BAKE_FILE)"
+	@docker buildx bake -f "$(DOCKER_BAKE_FILE)" --print
 	@docker buildx bake -f "$(DOCKER_BAKE_FILE)"
 	@echo "== Build succeeded"
 

diff --git a/vars/terraform.groovy b/vars/terraform.groovy
@@ -10,7 +10,7 @@ def call(userConfig = [:]) {
     productionCredentials: [], // No custom secrets for production by default
     productionBranch: 'main', // Defaults to the principal branch
     agentLabel: 'jnlp-linux-arm64', // replace agentContainerImage
-    agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.57', // Version managed by updatecli
+    agentContainerImage: 'jenkinsciinfra/hashicorp-tools:1.0.60', // Version managed by updatecli
     runTests: false, // Executes the tests provided by the "calling" project, which should provide a tests/Makefile
     runCommonTests: true, // Executes the default test suite from the shared tools repository (terratest)
   ]

diff --git a/vars/updatecli.groovy b/vars/updatecli.groovy
@@ -7,7 +7,7 @@ def call(userConfig = [:]) {
     action: 'diff', // Updatecli subcommand to execute
     config: './updatecli/updatecli.d', // Config manifest used by updatecli (can be a file or a directory)
     values: './updatecli/values.yaml', // Values file used by updatecli
-    updatecliDockerImage: 'jenkinsciinfra/helmfile:3.0.57', // Container image to use for running updatecli
+    updatecliDockerImage: 'jenkinsciinfra/helmfile:3.0.58', // Container image to use for running updatecli
     containerMemory: '512Mi', // When using 'updatecliDockerImage', this is the memory limit+request of the container
     cronTriggerExpression: '', // When specified, it enables cron trigger for the calling pipeline
     credentialsId: 'github-app-updatecli-on-jenkins-infra', // githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN

diff --git a/vars/updatecli.txt b/vars/updatecli.txt
@@ -8,7 +8,7 @@
       <li>String action: (Optional - Default: "diff") Updatecli action (e.g. subcommand) to execute.</li>
       <li>String config: (Optional - Default: "./updatecli/updatecli.d") path to the file or directory with the updatecli configuration (flag "--config").</li>
       <li>String values: (Optional - Default: "./updatecli/values.yaml") path to the file with the updatecli values (flag "--values").</li>
-      <li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:3.0.57") Docker Image of updatecli to be used in the process.</li>
+      <li>String updatecliDockerImage: (Optional - Default: "jenkinsciinfra/helmfile:3.0.58") Docker Image of updatecli to be used in the process.</li>
       <li>String cronTriggerExpression: (Optional - Default: "") Enable periodic execution by providing a cron-like expression.</li>
       <li>String containerMemory: (Optional - Default: "512Mi") specify the amount of memory dedicated to the updatecli container.</li>
       <li>String credentialsId: (Optional - Default: "github-app-updatecli-on-jenkins-infra") specify the githubApp or usernamePassword credentials id to use to get an Access Token. The corresponding populated env vars are USERNAME_VALUE & UPDATECLI_GITHUB_TOKEN</li>