Skip to content

Commit b2dfc8b

Browse files
Merge pull request #355 from openshift-cherrypick-robot/cherry-pick-354-to-release-0.9
[release-0.9] Set Golang version for specifing the correct toolchain
2 parents 90aa49d + 6309967 commit b2dfc8b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ COPY go.sum go.sum
1111

1212
RUN \
1313
# get Go version from mod file
14-
export GO_VERSION=$(grep -E "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
14+
export GO_VERSION=$(grep -oE "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
1515
echo ${GO_VERSION} && \
1616
# find filename for latest z version from Go download page
1717
export GO_FILENAME=$(curl -sL 'https://go.dev/dl/?mode=json&include=all' | jq -r "[.[] | select(.version | startswith(\"go${GO_VERSION}\"))][0].files[] | select(.os == \"linux\" and .arch == \"amd64\") | .filename") && \

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/medik8s/node-healthcheck-operator
22

3-
go 1.23
3+
go 1.23.0
44

55
require (
66
github.com/go-logr/logr v1.4.2

0 commit comments

Comments
 (0)