fix: Correct dockerfile and hail mary on linting failure

eksctl-io · Jan 22, 2025 · d14ad80 · d14ad80
1 parent eabbcf7
commit d14ad80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
@@ -13,12 +13,14 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
         with:
           fetch-depth: 0
+
       - name: Setup build environment
         uses: ./.github/actions/setup-build
+
       - name: Unit test
         run: |
-          PATH=$PATH:$(go env GOPATH)/bin make build
-          PATH=$PATH:$(go env GOPATH)/bin make unit-test-no-generate
+          make build
+          make unit-test-no-generate
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -27,11 +29,12 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
         with:
           fetch-depth: 0
+
       - name: Setup build environment
         uses: ./.github/actions/setup-build
+
       - name: Lint
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make lint
+        run: make lint
 
   image:
     name: Build and check image
@@ -41,6 +44,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
         with:
           fetch-depth: 0
+
       - name: Build image
         id: push
         uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc #v6.11.0

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM public.ecr.aws/docker/library/golang:1.22.10 AS builder
+FROM public.ecr.aws/docker/library/golang:1.21.10 AS builder
 
 WORKDIR /src
 COPY . .