From 67118cd380677f1a619b65e4a9e21f06d2d9a93f Mon Sep 17 00:00:00 2001 From: LaurentLesle Date: Tue, 26 Jul 2022 08:42:17 +0200 Subject: [PATCH 1/4] Fix permission on agent --- agents/github/github.sh | 1 - scripts/tfstate.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/github/github.sh b/agents/github/github.sh index 8beb14dd..06655564 100644 --- a/agents/github/github.sh +++ b/agents/github/github.sh @@ -34,7 +34,6 @@ echo " - name: ${AGENT_NAME}" ./config.sh \ --unattended \ - --disableupdate \ --replace \ --url ${URL} \ --token ${AGENT_TOKEN} \ diff --git a/scripts/tfstate.sh b/scripts/tfstate.sh index 05972d4c..c04e3453 100644 --- a/scripts/tfstate.sh +++ b/scripts/tfstate.sh @@ -17,7 +17,7 @@ function tfstate_configure { azurerm) echo "@calling tfstate_configure -- azurerm" sudo rm -f -- ${landingzone_name}/backend.hcl.tf - cp -f ${script_path}/backend.azurerm.tf ${landingzone_name}/backend.azurerm.tf + sudo cp -f ${script_path}/backend.azurerm.tf ${landingzone_name}/backend.azurerm.tf ;; remote) echo "@calling tfstate_configure -- remote" @@ -277,7 +277,7 @@ function destroy_from_remote_state { function terraform_init_azurerm { sudo rm -f -- ${landingzone_name}/backend.hcl.tf - cp -f /tf/rover/backend.azurerm.tf ${landingzone_name}/backend.azurerm.tf + sudo cp -f /tf/rover/backend.azurerm.tf ${landingzone_name}/backend.azurerm.tf case ${terraform_version} in *"15"* | *"1."*) From fb7540c967cf1c18c953ff7be13ab7d83b5f1b18 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Tue, 26 Jul 2022 08:53:48 +0000 Subject: [PATCH 2/4] Update to ubuntu 22.04 --- .env.terraform | 3 ++- .pre-commit-config.yaml | 2 +- Dockerfile | 4 ++-- docker-bake-agents.hcl | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.env.terraform b/.env.terraform index bc190a62..b72af534 100644 --- a/.env.terraform +++ b/.env.terraform @@ -1,2 +1,3 @@ -1.2.3 +1.2.5 1.1.9 +1.3.0-alpha20220706 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f51e3945..fec72df6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: hooks: - id: docker-compose-check - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.3.0 hooks: - id: check-merge-conflict - id: trailing-whitespace diff --git a/Dockerfile b/Dockerfile index 7decdf7f..fd202df2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ########################################################### # base tools and dependencies ########################################################### -FROM --platform=${TARGETPLATFORM} ubuntu:21.10 as base +FROM --platform=${TARGETPLATFORM} ubuntu:22.04 as base SHELL ["/bin/bash", "-c"] @@ -97,7 +97,7 @@ RUN apt-get update && \ # # Add Microsoft repository # - sudo apt-add-repository https://packages.microsoft.com/ubuntu/21.10/prod && \ + sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod && \ # # Add Docker repository # diff --git a/docker-bake-agents.hcl b/docker-bake-agents.hcl index 2fa65d26..5a299550 100644 --- a/docker-bake-agents.hcl +++ b/docker-bake-agents.hcl @@ -24,7 +24,7 @@ variable "versionRover" { } group "rover_agents" { - targets = ["github","azdo", "tfc", "gitlab"] + targets = ["github", "tfc", "gitlab"] } target "github" { From 4d75078aac05bed230cb9f3a9ccba1537cc4e0dd Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Wed, 27 Jul 2022 11:37:18 +0800 Subject: [PATCH 3/4] Updating components --- docker-bake.override.hcl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-bake.override.hcl b/docker-bake.override.hcl index 3f24d130..9c22d98e 100644 --- a/docker-bake.override.hcl +++ b/docker-bake.override.hcl @@ -1,16 +1,16 @@ # Base image tools version extensionsAzureCli="resource-graph" -versionDockerCompose="2.2.3" -versionGolang="1.18.2" -versionKubectl="1.23.3" -versionPacker="1.8.0" -versionPowershell="7.2.2" +versionDockerCompose="2.6.1" +versionGolang="1.18.4" +versionKubectl="1.24.3" +versionPacker="1.8.2" +versionPowershell="7.2.5" versionTerraformDocs="0.16.0" -versionVault="1.10.3" +versionVault="1.11.1" # Agents versions USERNAME="vscode" versionAzdo="2.204.0" -versionGithubRunner="2.292.0" -versionGitlab="15.0.0" -versionTfc="1.2.2" \ No newline at end of file +versionGithubRunner="2.294.0" +versionGitlab="15.2.1" +versionTfc="1.2.6" \ No newline at end of file From ef7c63bdc1291b7da4878ffca2601a40b3339002 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 28 Jul 2022 13:34:29 +0800 Subject: [PATCH 4/4] Adding by default cli extension --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index fd202df2..f1a90b6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -213,6 +213,7 @@ RUN apt-get update && \ # echo "Installing latest Azure CLI ..." && \ pip3 install azure-cli && \ + az extension add --name ${extensionsAzureCli} --system && \ az config set extension.use_dynamic_install=yes_without_prompt && \ # # Install checkov