From a083a9e53c10ed61529a847708d1b767128067ea Mon Sep 17 00:00:00 2001
From: cpu1 <patwal.chetan@gmail.com>
Date: Fri, 21 Jul 2023 12:23:03 +0530
Subject: [PATCH] Fix error with tar in `Post Cache go-build and mod` step

The post-run step of `actions/cache@v3` requires a POSIX-compliant tar, but the Alpine base image contains BusyBox tar. This changelist fixes this by installing GNU tar.

Fixes #6765
---
 .github/workflows/release-candidate.yaml | 2 +-
 .github/workflows/release.yaml           | 2 +-
 .github/workflows/update-generated.yaml  | 2 +-
 Dockerfile                               | 2 +-
 build/docker/Dockerfile                  | 1 +
 build/docker/build_image_manifest        | 2 +-
 build/docker/image_tag                   | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml
index 2c1b3fa77e..e1a854732d 100644
--- a/.github/workflows/release-candidate.yaml
+++ b/.github/workflows/release-candidate.yaml
@@ -7,7 +7,7 @@ jobs:
   rc:
     name: Trigger release candidate build
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:23601df136dfb53b31a3e54f54d8fa9f5a9262f8
+    container: public.ecr.aws/eksctl/eksctl-build:b06c1f3d2a18a98695327e6f8da535ded95083b7
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0fda1bbb5f..5fc2aeea6e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ jobs:
   rc:
     name: Trigger release build
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:23601df136dfb53b31a3e54f54d8fa9f5a9262f8
+    container: public.ecr.aws/eksctl/eksctl-build:b06c1f3d2a18a98695327e6f8da535ded95083b7
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml
index f80009f264..ce5b41fc1b 100644
--- a/.github/workflows/update-generated.yaml
+++ b/.github/workflows/update-generated.yaml
@@ -11,7 +11,7 @@ jobs:
   update_aws_node:
     name: Update aws-node and open PR
     runs-on: ubuntu-latest
-    container: public.ecr.aws/eksctl/eksctl-build:23601df136dfb53b31a3e54f54d8fa9f5a9262f8
+    container: public.ecr.aws/eksctl/eksctl-build:b06c1f3d2a18a98695327e6f8da535ded95083b7
     env:
       UPDATE_BRANCH: update-aws-node
       GOPRIVATE: ""
diff --git a/Dockerfile b/Dockerfile
index 9630a7ec65..914903d9da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:23601df136dfb53b31a3e54f54d8fa9f5a9262f8
+ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:b06c1f3d2a18a98695327e6f8da535ded95083b7
 FROM $BUILD_IMAGE as build
 
 WORKDIR /src
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 622b8f678d..73037af40e 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -20,6 +20,7 @@ RUN apk add --no-cache \
     musl-dev \
     jq \
     py3-setuptools \
+    tar \
     && true
 
 # Runtime dependencies. Build the root filesystem of the eksctl image at /out
diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest
index 23601df136..b06c1f3d2a 100644
--- a/build/docker/build_image_manifest
+++ b/build/docker/build_image_manifest
@@ -14,6 +14,6 @@
 "k8s.io/code-generator v0.25.11"
 "sigs.k8s.io/mdtoc v1.1.0"
 "github.com/vburenin/ifacemaker v1.2.1"
-100644 blob 622b8f678db0e0baa19653e0544abd7d20832ce5	build/docker/Dockerfile
+100644 blob 73037af40e41f5241efaa821aec1e4bf930e9979	build/docker/Dockerfile
 100644 blob b097bb369defa4cd14965008ba727b4f861bbdea	.requirements
 100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7	build/scripts/install-build-deps.sh
diff --git a/build/docker/image_tag b/build/docker/image_tag
index 7446dde59a..ea202680ed 100644
--- a/build/docker/image_tag
+++ b/build/docker/image_tag
@@ -1 +1 @@
-23601df136dfb53b31a3e54f54d8fa9f5a9262f8
+b06c1f3d2a18a98695327e6f8da535ded95083b7