Skip to content

Commit 85cf831

Browse files
committed
Update GoLang, python and base images
chore: Update GoLang to 1.22 Update Python to 3.11 Update base images from UBI8 to UBI9 Signed-off-by: Spolti <[email protected]>
1 parent 046fdbc commit 85cf831

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
repos:
1515
- repo: https://github.com/golangci/golangci-lint
16-
rev: v1.51.2
16+
rev: v1.60.3
1717
hooks:
1818
- id: golangci-lint
1919
entry: golangci-lint run

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
5151
###############################################################################
5252
# Stage 2: Copy build assets to create the smallest final runtime image
5353
###############################################################################
54-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS runtime
54+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 AS runtime
5555

5656
ARG USER=2000
5757
ARG IMAGE_VERSION

Dockerfile.develop

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
###############################################################################
2222
# Create the develop, test, and build environment
2323
###############################################################################
24-
ARG GOLANG_VERSION=1.21
25-
FROM registry.access.redhat.com/ubi8/go-toolset:$GOLANG_VERSION
24+
ARG GOLANG_VERSION=1.22
25+
FROM registry.access.redhat.com/ubi9/go-toolset:$GOLANG_VERSION
2626

2727

2828
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
@@ -44,14 +44,15 @@ ENV HOME=/root
4444
WORKDIR /workspace
4545

4646
# Install build and dev tools
47-
# NOTE: Require python38 to install pre-commit
47+
# NOTE: Require python to install pre-commit
4848
RUN --mount=type=cache,target=/root/.cache/dnf:rw \
4949
dnf install --setopt=cachedir=/root/.cache/dnf -y --nodocs \
5050
nodejs \
5151
jq \
52-
python38 \
53-
&& ln -sf /usr/bin/python3 /usr/bin/python \
54-
&& ln -sf /usr/bin/pip3 /usr/bin/pip \
52+
python3.11 \
53+
python3.11-pip \
54+
&& alternatives --install /usr/bin/python python /usr/bin/python3.11 1 \
55+
&& alternatives --install /usr/bin/pip pip /usr/bin/pip3.11 1 \
5556
&& true
5657

5758
# Install pre-commit

controllers/modelmesh/cluster_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (cc ClusterConfig) Reconcile(ctx context.Context, namespace string, cl clie
7171
return err
7272
}
7373

74-
if cc.SRSpecs == nil || len(cc.SRSpecs) == 0 {
74+
if len(cc.SRSpecs) == 0 {
7575
if !notfound {
7676
return cl.Delete(ctx, m)
7777
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kserve/modelmesh-serving
22

3-
go 1.21
3+
go 1.22.9
44

55
require (
66
github.com/dereklstinson/cifar v0.0.0-20200421171932-5722a3b6a0c7

0 commit comments

Comments
 (0)