Skip to content

Commit

Permalink
Fix error with tar in Post Cache go-build and mod step
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cPu1 committed Jul 21, 2023
1 parent 4aaa6ed commit ee5492e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/docker/build_image_manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/docker/image_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23601df136dfb53b31a3e54f54d8fa9f5a9262f8
b06c1f3d2a18a98695327e6f8da535ded95083b7

0 comments on commit ee5492e

Please sign in to comment.