From 31a5a80ea5e8a0aa8135e5daae073b55218abd4a Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Sat, 19 Mar 2022 20:19:48 +0100
Subject: [PATCH] Bump to latest version of buildx and docker-compose

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

diff --git a/github-runner-ami/packer/files/docker-buildx.sh b/github-runner-ami/packer/files/docker-buildx.sh
index 6964321..f2e78d2 100644
--- a/github-runner-ami/packer/files/docker-buildx.sh
+++ b/github-runner-ami/packer/files/docker-buildx.sh
@@ -23,7 +23,7 @@ if [[ ${architecture} == "x86_64" ]] ; then
     architecture="amd64"
 fi
 # Hard-code docker buildx version
-buildx_version="v0.7.1"
+buildx_version="v0.8.0"
 buildx_binary="buildx-${buildx_version}.$(uname -s)-${architecture}"
 plugins_dir="/home/runner/.docker/cli-plugins"
 sudo -u runner mkdir -pv "${plugins_dir}"
diff --git a/github-runner-ami/packer/files/docker-compose.sh b/github-runner-ami/packer/files/docker-compose.sh
index 6731124..79cc59a 100644
--- a/github-runner-ami/packer/files/docker-compose.sh
+++ b/github-runner-ami/packer/files/docker-compose.sh
@@ -29,6 +29,6 @@ set -exu -o pipefail
 #curl --fail -L "$URL" -o /usr/local/bin/docker-compose
 #chmod +x /usr/local/bin/docker-compose
 
-# Hard-code docker-compose 1.29.2
-curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+# Hard-code docker-compose 2.3.3
+curl -L "https://github.com/docker/compose/releases/download/2.3.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
diff --git a/github-runner-ami/packer/ubuntu2004.pkr.hcl b/github-runner-ami/packer/ubuntu2004.pkr.hcl
index 46e8cf5..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}-v1"
+  ami_name = "${var.ami_name}-${var.runner_version}-v2"
   ami_regions = var.aws_regions
   tag {
     key   = "Name"