diff --git a/EKS_DISTRO_TAG_FILE.yaml b/EKS_DISTRO_TAG_FILE.yaml index 3769a66d8..2a38c979a 100644 --- a/EKS_DISTRO_TAG_FILE.yaml +++ b/EKS_DISTRO_TAG_FILE.yaml @@ -21,15 +21,15 @@ al2: eks-distro-minimal-base-golang-compiler-1.18-base: 1.18-2023-11-02-1698930336.2 eks-distro-minimal-base-golang-compiler-1.18-yum: 1.18-yum-2023-11-02-1698930336.2 eks-distro-minimal-base-golang-compiler-1.18-gcc: 1.18-gcc-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.19-base: 1.19-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.19-yum: 1.19-yum-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.19-gcc: 1.19-gcc-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2023-11-02-1698930336.2 - eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2023-11-02-1698930336.2 + eks-distro-minimal-base-golang-compiler-1.19-base: null + eks-distro-minimal-base-golang-compiler-1.19-yum: null + eks-distro-minimal-base-golang-compiler-1.19-gcc: null + eks-distro-minimal-base-golang-compiler-1.20-base: null + eks-distro-minimal-base-golang-compiler-1.20-yum: null + eks-distro-minimal-base-golang-compiler-1.20-gcc: null + eks-distro-minimal-base-golang-compiler-1.21-base: null + eks-distro-minimal-base-golang-compiler-1.21-yum: null + eks-distro-minimal-base-golang-compiler-1.21-gcc: null eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-11-02-1698930336.2 eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-11-02-1698930336.2 eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-11-02-1698930336.2 @@ -62,15 +62,15 @@ al2023: eks-distro-minimal-base-golang-compiler-1.18-base: 1.18-2023-11-06-1699254095.2023 eks-distro-minimal-base-golang-compiler-1.18-yum: 1.18-yum-2023-11-06-1699254095.2023 eks-distro-minimal-base-golang-compiler-1.18-gcc: 1.18-gcc-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.19-base: 1.19-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.19-yum: 1.19-yum-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.19-gcc: 1.19-gcc-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2023-11-06-1699254095.2023 - eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2023-11-06-1699254095.2023 + eks-distro-minimal-base-golang-compiler-1.19-base: null + eks-distro-minimal-base-golang-compiler-1.19-yum: null + eks-distro-minimal-base-golang-compiler-1.19-gcc: null + eks-distro-minimal-base-golang-compiler-1.20-base: null + eks-distro-minimal-base-golang-compiler-1.20-yum: null + eks-distro-minimal-base-golang-compiler-1.20-gcc: null + eks-distro-minimal-base-golang-compiler-1.21-base: null + eks-distro-minimal-base-golang-compiler-1.21-yum: null + eks-distro-minimal-base-golang-compiler-1.21-gcc: null eks-distro-minimal-base-nodejs-compiler-16-base: 16-2023-11-06-1699254095.2023 eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2023-11-06-1699254095.2023 eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2023-11-06-1699254095.2023 diff --git a/builder-base/versions.yaml b/builder-base/versions.yaml index b5d35c203..3f16a715e 100644 --- a/builder-base/versions.yaml +++ b/builder-base/versions.yaml @@ -4,9 +4,9 @@ BUILDKIT_VERSION: v0.10.5 GITHUB_CLI_VERSION: 2.21.1 GOLANG_VERSION_117: 1.17.13-6 GOLANG_VERSION_118: 1.18.10-8 -GOLANG_VERSION_119: 1.19.13-12 -GOLANG_VERSION_120: 1.20.10-11 -GOLANG_VERSION_121: 1.21.3-4 +GOLANG_VERSION_119: 1.19.13-13 +GOLANG_VERSION_120: 1.20.11-12 +GOLANG_VERSION_121: 1.21.4-5 GO_LICENSES_VERSION: v1.6.0 GOVC_VERSION: 0.25.0 GO_VULN_CHECK_VERSION: v1.0.1 @@ -22,4 +22,5 @@ PYWINRM_VERSION: 0.4.1 SKOPEO_VERSION: v1.5.2 SKOPEO_VERSION_AL23: v1.13.3 UPX_VERSION: 4.2.0 -YQ_VERSION: v4.30.6 \ No newline at end of file +YQ_VERSION: v4.30.6 + diff --git a/eks-distro-base/Makefile b/eks-distro-base/Makefile index 2c7039aef..76e089493 100644 --- a/eks-distro-base/Makefile +++ b/eks-distro-base/Makefile @@ -203,9 +203,9 @@ GOLANG_VARIANT_NAME=eks-distro-minimal-base-golang-compiler BASE_GOLANG_VARIANT_VERSIONS=1.18 1.19 1.20 1.21 GOLANG_1.18_FULL_VERSION=1.18.10-8 -GOLANG_1.19_FULL_VERSION=1.19.13-12 -GOLANG_1.20_FULL_VERSION=1.20.10-11 -GOLANG_1.21_FULL_VERSION=1.21.3-4 +GOLANG_1.19_FULL_VERSION=1.19.13-13 +GOLANG_1.20_FULL_VERSION=1.20.11-12 +GOLANG_1.21_FULL_VERSION=1.21.4-5 BASE_GOLANG_COMPILER_VARIANT_VERSIONS=$(foreach ver,$(BASE_GOLANG_VARIANT_VERSIONS),$(addprefix $(ver)-,$(BASE_COMPILER_VARIANT_VERSIONS))) # ************************************************************