Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Go 1.23 to final stage in builder-base Dockerfile #1524

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Add Go 1.23 to final stage in builder-base Dockerfile #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions builder-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ COPY --link --from=golang-1.21 /golang-1.21 /
COPY --link --from=go-licenses-1.21 /go-licenses-1.21 /
COPY --link --from=golang-1.22 /golang-1.22 /
COPY --link --from=go-licenses-1.22 /go-licenses-1.22 /
COPY --link --from=golang-1.23 /golang-1.23 /
COPY --link --from=go-licenses-1.23 /go-licenses-1.23 /
COPY --link --from=go-vuln-check /go-vuln-check /
# add the default golang verison last so its /usr/bin/go
# takes precendent
Expand Down
4 changes: 2 additions & 2 deletions builder-base/scripts/check_upstream_golang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ function update::go::version {

local -r cur_builder_base_version=$(cat "${VERSIONS_YAML}" | grep -E "^GOLANG_VERSION_${majorversion//./}")

sed -i "s/${cur_builder_base_version}/GOLANG_VERSION_${majorversion//./}: ${version}-0/g" "${VERSIONS_YAML}"
yq eval -i -P ".GOLANG_VERSION_${majorversion//./} = \"${version}-0\" | sort_keys(.)" "${VERSIONS_YAML}"
}

function add::go::version {
local -r version=$1
local -r majorversion=$(if [[ $(echo "$version" | awk -F'.' '{print NF}') -ge 3 ]]; then echo ${version%.*}; else echo ${version%-*}; fi)

echo "GOLANG_VERSION_${majorversion//./}: $version-0" >>$VERSIONS_YAML
yq eval -i -P ".GOLANG_VERSION_${majorversion//./} = \"${version}-0\" | sort_keys(.)" "${VERSIONS_YAML}"
}

# Using YQ allows us to modify the existing tag or add the correct tag if it doesn't exist
Expand Down
2 changes: 2 additions & 0 deletions builder-base/scripts/validate_components.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ if [ "${FINAL_STAGE_BASE}" = "full-copy-stage" ]; then
/go/go1.21/bin/go-licenses --help
/go/bin/go1.22 version
/go/go1.22/bin/go-licenses --help
/go/bin/go1.23 version
/go/go1.23/bin/go-licenses --help

gcc --version

Expand Down
8 changes: 4 additions & 4 deletions builder-base/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ GOLANG_VERSION_119: 1.19.13-14
GOLANG_VERSION_120: 1.20.14-16
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes here are purely cosmetic, just alphabetical sorting.

GOLANG_VERSION_121: 1.21.13-0
GOLANG_VERSION_122: 1.22.6-0
GO_LICENSES_VERSION: v1.6.0
GOLANG_VERSION_123: 1.23.0-0
GOSS_VERSION: 3.1.4
GOVC_VERSION: 0.34.2
GO_LICENSES_VERSION: v1.6.0
GO_VULN_CHECK_VERSION: v1.0.1
GOSS_VERSION: 3.1.4
HELM_VERSION: 3.8.1
HUGO_VERSION: 0.85.0
LINUXKIT_VERSION: v0.0.0-20220415093837-b710224cdf9a
NODEJS_VERSION: v16.18.1
NOTATION_VERSION: 1.0.1
ORAS_VERSION: 1.1.0
OVERRIDE_BASH_VERSION: 4.3
PACKER_VERSION: 1.9.5
PACKER_ANSIBLE_PLUGIN: v1.1.1
PACKER_VERSION: 1.9.5
PYWINRM_VERSION: 0.4.1
SEVENZIP_VERSION: 24.06
SKOPEO_VERSION: v1.5.2
SKOPEO_VERSION_AL23: v1.13.3
UPX_VERSION: 4.2.0
YQ_VERSION: v4.30.6
GOLANG_VERSION_123: 1.23.0-0
Loading