diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 47f09a3cc8..7f2865209a 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:5e2d110f32a60d699ca0642ac3287190227c45ec + container: public.ecr.aws/eksctl/eksctl-build:9b3f575ceb1a272a000ca1fbaded0174096a007a steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1931018b43..e2c4ca4ab7 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:5e2d110f32a60d699ca0642ac3287190227c45ec + container: public.ecr.aws/eksctl/eksctl-build:9b3f575ceb1a272a000ca1fbaded0174096a007a steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml index ce804b7686..ecf29ff1d9 100644 --- a/.github/workflows/update-generated.yaml +++ b/.github/workflows/update-generated.yaml @@ -18,7 +18,7 @@ jobs: resource: ["coredns", "aws-node"] name: Update ${{ matrix.resource }} and open PR runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec + container: public.ecr.aws/eksctl/eksctl-build:9b3f575ceb1a272a000ca1fbaded0174096a007a env: GOPRIVATE: "" steps: diff --git a/.golangci.yml b/.golangci.yml index 13e06ccf62..f57d085cc8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ # options for analysis running run: - go: '1.20' + go: '1.21' # default concurrency is a available CPU number concurrency: 4 diff --git a/Dockerfile b/Dockerfile index 57633e47c3..2bd25a4301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec +ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:9b3f575ceb1a272a000ca1fbaded0174096a007a FROM $BUILD_IMAGE as build WORKDIR /src diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 80fe0de3da..d3ad8df01a 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,7 +1,7 @@ # Make sure to run the following commands after changes to this file are made: # `make -f Makefile.docker update-build-image-tag && make -f Makefile.docker push-build-image` -FROM golang:1.20.8-alpine3.18@sha256:90246ec31bcf460ff3dbe8a4a63e8997bc36781a2eba9e0419e9b53e0bd36a0d AS base +FROM golang:1.21.7-alpine3.19@sha256:163801a964d358d6450aeb51b59d5c807d43a7c97fed92cc7ff1be5bd72811ab AS base # Add kubectl and aws-iam-authenticator to the PATH ENV PATH="${PATH}:/out/usr/bin:/out/usr/local/bin" diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest index 5e2d110f32..9b3f575ceb 100644 --- a/build/docker/build_image_manifest +++ b/build/docker/build_image_manifest @@ -14,6 +14,6 @@ "k8s.io/code-generator v0.29.0" "sigs.k8s.io/mdtoc v1.1.0" "github.com/vburenin/ifacemaker v1.2.1" -100644 blob 80fe0de3dabc122dacbf9fd528653fab7c25af4b build/docker/Dockerfile +100644 blob d3ad8df01a6d4b3470b73aa0b7b4d1e2393ac1a6 build/docker/Dockerfile 100644 blob 5a6c9ae4c6009fa13d955867f2ff8706038d7110 .requirements 100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7 build/scripts/install-build-deps.sh diff --git a/build/docker/image_tag b/build/docker/image_tag index 9b3d6c6fcc..cfb0163a9d 100644 --- a/build/docker/image_tag +++ b/build/docker/image_tag @@ -1 +1 @@ -5e2d110f32a60d699ca0642ac3287190227c45ec +9b3f575ceb1a272a000ca1fbaded0174096a007a