From d3098d8c17d73e4157144acdd74b59d2a106f8ff Mon Sep 17 00:00:00 2001
From: Thierry de Pauw <thierry@thinkinglabs.io>
Date: Mon, 6 Nov 2023 18:38:07 +0100
Subject: [PATCH] Bump packer to v1.9.4 and ansible to v8.4.0 (#7)

---
 ansible/.version   |  2 +-
 ansible/Dockerfile | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ansible/.version b/ansible/.version
index 09800e5..61e19d7 100644
--- a/ansible/.version
+++ b/ansible/.version
@@ -1 +1 @@
-v1.8.5-ansible-7.2.0
+v1.9.4-ansible-8.4.0
diff --git a/ansible/Dockerfile b/ansible/Dockerfile
index 5aa1b7f..698c23d 100644
--- a/ansible/Dockerfile
+++ b/ansible/Dockerfile
@@ -1,11 +1,13 @@
 FROM alpine:edge
 
 ARG PLATFORM=linux_amd64
-ARG PACKER_VERSION=1.8.5
+ARG PACKER_VERSION=1.9.4
 ARG PACKER_DIST_FILENAME=packer_${PACKER_VERSION}_${PLATFORM}.zip
 ARG PACKER_DIST_CHECKSUM_FILENAME=packer_${PACKER_VERSION}_SHA256SUMS
-ARG ANSIBLE_VERSION=7.2.0-r0
-ARG ANSIBLE_LINT_VERSION=6.11.0-r0
+ARG PACKER_PLUGIN_AMAZON_VERSION=1.2.6
+ARG PACKER_PLUGIN_ANSIBLE_VERSION=1.1.0
+ARG ANSIBLE_VERSION=8.4.0-r0
+ARG ANSIBLE_LINT_VERSION=6.21.1-r0
 
 LABEL org.opencontainers.image.description="Hashicorp Packer with Ansible" \
       org.opencontainers.image.authors="ThinkingLabs (hello@thinkinglabs.io)" \
@@ -18,4 +20,6 @@ RUN wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/${PACKER_DIST_F
     && set -o pipefail && grep ${PLATFORM} ${PACKER_DIST_CHECKSUM_FILENAME} | sha256sum -c - \
     && unzip ${PACKER_DIST_FILENAME} -d /usr/local/bin \
     && rm ${PACKER_DIST_FILENAME} ${PACKER_DIST_CHECKSUM_FILENAME} \
-    && apk add --no-cache ansible=${ANSIBLE_VERSION} ansible-lint=${ANSIBLE_LINT_VERSION} py3-filelock jq make
+    && apk add --no-cache ansible=${ANSIBLE_VERSION} ansible-lint=${ANSIBLE_LINT_VERSION} py3-filelock jq make \
+    && packer plugins install github.com/hashicorp/amazon ${PACKER_PLUGIN_AMAZON_VERSION} \
+    && packer plugins install github.com/hashicorp/ansible ${PACKER_PLUGIN_ANSIBLE_VERSION}