Skip to content

Commit

Permalink
Merge pull request #149 from openshift-cherrypick-robot/cherry-pick-1…
Browse files Browse the repository at this point in the history
…48-to-release-0.4

[release-0.4] Set Golang version for specifing the correct toolchain
  • Loading branch information
openshift-merge-bot[bot] authored Dec 11, 2024
2 parents d6259c5 + 8cac1b0 commit 1bdbcc0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY go.sum go.sum

RUN \
# get Go version from mod file
export GO_VERSION=$(grep -E "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
export GO_VERSION=$(grep -oE "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
echo ${GO_VERSION} && \
# find filename for latest z version from Go download page
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") && \
Expand All @@ -36,7 +36,7 @@ COPY version/ version/
# Build
RUN ./hack/build.sh .

# Use ubi8 micro as base image to package the manager binary
# Use ubi9 micro as base image to package the manager binary
FROM registry.access.redhat.com/ubi9/ubi-micro:latest
WORKDIR /
COPY --from=builder /workspace/manager .
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/medik8s/machine-deletion-remediation

go 1.23
go 1.23.0

require (
github.com/go-logr/logr v1.4.2
Expand Down

0 comments on commit 1bdbcc0

Please sign in to comment.