From 3d0926b51c141f9c8836258030bfa5b0840edf58 Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Fri, 11 Mar 2022 23:00:04 -0600
Subject: [PATCH 1/3] Update deprecated circleci images to latest

---
 .circleci/config.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4e97d7..e67e4b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,8 @@
 defaults: &defaults
   working_directory: /home/circleci/.go_workspace/src/github.com/gruntwork-io/gruntwork-installer
-  machine: true
+  machine:
+    enabled: true
+    image: ubuntu-2004:202111-02
 version: 2
 jobs:
   test:
@@ -11,6 +13,9 @@ jobs:
           name: run tests
           command: |
             ./_ci/run-tests.sh
+    machine:
+      enabled: true
+      image: ubuntu-2004:202111-02
 workflows:
   version: 2
   install-and-test:

From 2e15b03491b99f79a4c15c0df2d1d16d7a7df37a Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Fri, 11 Mar 2022 23:05:11 -0600
Subject: [PATCH 2/3] Remove duplicated machine clause

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e67e4b8..1e10f20 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,9 +13,6 @@ jobs:
           name: run tests
           command: |
             ./_ci/run-tests.sh
-    machine:
-      enabled: true
-      image: ubuntu-2004:202111-02
 workflows:
   version: 2
   install-and-test:

From 7778b9af85a27d5a0ea7c1f20fd4a2f9bf1ac18e Mon Sep 17 00:00:00 2001
From: Yoriyasu Yano <430092+yorinasub17@users.noreply.github.com>
Date: Wed, 6 Jul 2022 21:13:12 -0500
Subject: [PATCH 3/3] Update to latest machine image

---
 .circleci/config.yml                |  2 +-
 test/amazonlinux/docker-compose.yml | 21 +++++++++++----------
 test/centos/docker-compose.yml      | 21 +++++++++++----------
 test/no_sudo/docker-compose.yml     | 21 +++++++++++----------
 test/ubuntu/docker-compose.yml      | 21 +++++++++++----------
 test/ubuntu18/docker-compose.yml    | 21 +++++++++++----------
 6 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e10f20..f917d6e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ defaults: &defaults
   working_directory: /home/circleci/.go_workspace/src/github.com/gruntwork-io/gruntwork-installer
   machine:
     enabled: true
-    image: ubuntu-2004:202111-02
+    image: ubuntu-2204:2022.04.1
 version: 2
 jobs:
   test:
diff --git a/test/amazonlinux/docker-compose.yml b/test/amazonlinux/docker-compose.yml
index 28b44a5..034bbf2 100644
--- a/test/amazonlinux/docker-compose.yml
+++ b/test/amazonlinux/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-amazonlinux
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-amazonlinux
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/centos/docker-compose.yml b/test/centos/docker-compose.yml
index 6a9da7a..9835654 100644
--- a/test/centos/docker-compose.yml
+++ b/test/centos/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-centos
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-centos
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/no_sudo/docker-compose.yml b/test/no_sudo/docker-compose.yml
index bf93a3f..fa3ebc8 100644
--- a/test/no_sudo/docker-compose.yml
+++ b/test/no_sudo/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-no-sudo-ubuntu
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-no-sudo-ubuntu
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/ubuntu/docker-compose.yml b/test/ubuntu/docker-compose.yml
index 0cfd1f5..473eb05 100644
--- a/test/ubuntu/docker-compose.yml
+++ b/test/ubuntu/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-ubuntu
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-ubuntu
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/ubuntu18/docker-compose.yml b/test/ubuntu18/docker-compose.yml
index 943e568..477277c 100644
--- a/test/ubuntu18/docker-compose.yml
+++ b/test/ubuntu18/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-ubuntu18
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-ubuntu18
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN