From fec4cd5c642a736e0a81c11827d085c7f1a84b0a Mon Sep 17 00:00:00 2001
From: Daniel Bast <2790401+dbast@users.noreply.github.com>
Date: Sat, 9 Sep 2023 16:52:04 +0200
Subject: [PATCH] Update packer to 1.9.4 (#301)

* Update packer to 1.9.4

* Add bin to PACKER_PLUGIN_PATH for the packer-builder-arm binary

* Reverse plugin path order
---
 .github/workflows/archlinuxarm-armv7-docker.yml | 2 +-
 .github/workflows/archlinuxarm-armv8-docker.yml | 2 +-
 .github/workflows/test.yml                      | 2 +-
 docker/Dockerfile                               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/archlinuxarm-armv7-docker.yml b/.github/workflows/archlinuxarm-armv7-docker.yml
index 82936fe..f022f32 100644
--- a/.github/workflows/archlinuxarm-armv7-docker.yml
+++ b/.github/workflows/archlinuxarm-armv7-docker.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install Packer
         uses: hashicorp-contrib/setup-packer@v2
         with:
-          packer-version: 1.9.1
+          packer-version: 1.9.4
 
       - name: Build image
         run: sudo packer build -var docker_user=$docker_user -var docker_password=$docker_password -var docker_repository=$docker_repository boards/armv7/archlinuxarm-docker.json
diff --git a/.github/workflows/archlinuxarm-armv8-docker.yml b/.github/workflows/archlinuxarm-armv8-docker.yml
index f10c676..34a9dd3 100644
--- a/.github/workflows/archlinuxarm-armv8-docker.yml
+++ b/.github/workflows/archlinuxarm-armv8-docker.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install Packer
         uses: hashicorp-contrib/setup-packer@v2
         with:
-          packer-version: 1.9.1
+          packer-version: 1.9.4
 
       - name: Build image
         run: sudo packer build -var docker_user=$docker_user -var docker_password=$docker_password -var docker_repository=$docker_repository boards/armv8/archlinuxarm-docker.json
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f32677c..f72c1b2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -95,7 +95,7 @@ jobs:
       - name: Install Packer
         uses: hashicorp-contrib/setup-packer@v2
         with:
-          packer-version: 1.9.1
+          packer-version: 1.9.4
 
       - name: Retrieve cache
         uses: actions/cache@v3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a68a2d0..086cbd5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,7 +32,7 @@ COPY . .
 
 RUN go build -o packer-builder-arm
 
-ENV PACKER_VERSION 1.9.1
+ENV PACKER_VERSION 1.9.4
 
 RUN if [ "$(uname -m)" = "aarch64" ]; then PACKER_ARCH="arm64"; else PACKER_ARCH="amd64"; fi && \
   wget https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_${PACKER_ARCH}.zip -q -O /tmp/packer.zip && \
@@ -71,7 +71,7 @@ COPY --from=qemu_binaries /binaries/* /usr/bin/
 ENV PACKER_LOG=1
 
 # Enable plugin / download caching for consecutive runs
-ENV PACKER_PLUGIN_PATH="/build/.packer_plugins"
+ENV PACKER_PLUGIN_PATH="/bin:/build/.packer_plugins"
 ENV PACKER_CACHE_DIR="/build/.packer_cache"
 
 ENTRYPOINT ["/entrypoint.sh"]