Skip to content

Commit 0db5047

Browse files
committed
Apply go toolset workaround from upstream
1 parent e4e6d1f commit 0db5047

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

.github/renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"schedule": ["at any time"],
5050
"branchPrefix": "renovate/rpm/",
5151
"semanticCommits": "enabled"
52-
}
52+
}
5353
],
5454
"dockerfile": {
5555
"enabled": true,
@@ -117,7 +117,7 @@
117117
]
118118
},
119119
"rpm": {
120-
"enabled": true,
120+
"enabled": true,
121121
"schedule": ["at any time"]
122122
},
123123
"prHourlyLimit": 0

Dockerfile

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
# Build the manager binary
22

3-
FROM registry.access.redhat.com/ubi8/go-toolset:1.22@sha256:076c858c2a7e2d682c3b4098d44575d79c433b39a496b14ca63a723333af212d AS builder
3+
# BEGIN -- workaround lack of go-toolset for golang 1.23
4+
ARG GOLANG_IMAGE=docker.io/library/golang:1.23
5+
FROM ${GOLANG_IMAGE} AS golang
6+
7+
FROM registry.access.redhat.com/ubi8/ubi@sha256:fd3bf22d0593e2ed26a1c74ce161c52295711a67de677b5938c87704237e49b0 AS builder
8+
ARG GOLANG_VERSION=1.23.0
9+
10+
# Install system dependencies
11+
RUN dnf upgrade -y && dnf install -y \
12+
gcc \
13+
make \
14+
openssl-devel \
15+
git \
16+
&& dnf clean all && rm -rf /var/cache/yum
17+
18+
# Install Go
19+
ENV PATH=/usr/local/go/bin:$PATH
20+
21+
COPY --from=golang /usr/local/go /usr/local/go
22+
# End of Go versioning workaround
423

524
WORKDIR /workspace
625
# Copy the Go Modules manifests

0 commit comments

Comments
 (0)