[airflow-ci-infra] branch main updated: fix directory for the buildx plugin

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow-ci-infra.git


The following commit(s) were added to refs/heads/main by this push:
     new 9b386c0  fix directory for the buildx plugin
9b386c0 is described below

commit 9b386c0c28c573a0e291f60915ab69891884d627
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri Jan 21 09:31:02 2022 +0100

    fix directory for the buildx plugin
---
 github-runner-ami/packer/files/docker-buildx.sh | 3 ++-
 github-runner-ami/packer/ubuntu2004.pkr.hcl     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/github-runner-ami/packer/files/docker-buildx.sh 
b/github-runner-ami/packer/files/docker-buildx.sh
index ff318b8..e35da48 100644
--- a/github-runner-ami/packer/files/docker-buildx.sh
+++ b/github-runner-ami/packer/files/docker-buildx.sh
@@ -25,6 +25,7 @@ fi
 # Hard-code docker buildx version
 buildx_version="v0.7.1"
 buildx_binary="buildx-${buildx_version}.$(uname -s)-${architecture}"
-plugins_dir="${HOME}/.docker/cli-plugins"
+plugins_dir="/home/runner/.docker/cli-plugins"
 mkdir -pv "${plugins_dir}"
 curl -L 
"https://github.com/docker/buildx/releases/download/${buildx_version}/${buildx_binary}";
 -o "${plugins_dir}/${buildx_binary}"
+chown -R runner:runner "${plugins_dir}"
diff --git a/github-runner-ami/packer/ubuntu2004.pkr.hcl 
b/github-runner-ami/packer/ubuntu2004.pkr.hcl
index 1d62fa0..fe3c8dd 100644
--- a/github-runner-ami/packer/ubuntu2004.pkr.hcl
+++ b/github-runner-ami/packer/ubuntu2004.pkr.hcl
@@ -38,7 +38,7 @@ source "amazon-ebs" "runner_builder" {
   #access_key = ""
   #secret_key = ""
   region = var.aws_regions[0]
-  ami_name = "${var.ami_name}-${var.runner_version}"
+  ami_name = "${var.ami_name}-${var.runner_version}-v2"
   ami_regions = var.aws_regions
   tag {
     key   = "Name"
@@ -140,9 +140,9 @@ build {
       "./files/install-nodejs.sh",
       "./files/install-github-cli.sh",
       "./files/docker-compose.sh",
-      "./files/docker-buildx.sh",
       "./files/git.sh",
       "./files/runner_bootstrap.sh",
+      "./files/docker-buildx.sh",
       "./files/cleanup.sh",
     ]
     execute_command = "chmod +x '{{ .Path }}'; sudo sh -c '{{ .Vars }} {{ 
.Path }}'"