Skip to content

Commit 3b90e70

Browse files
authored
Sync (#91)
* Update Go Lang and base iamges (#100) chore: Update Go lang from 1.21 to 1.22.9 Update golint-ci to 1.60.3 to be compatible with go1.22 Update base images from UBI8 to UBI9 #### Motivation #### Modifications #### Result Signed-off-by: Spolti <[email protected]> * fix the primary link for python must be /usr/bin/unversioned-python Signed-off-by: Filippe <[email protected]> --------- Signed-off-by: Spolti <[email protected]> Signed-off-by: Filippe <[email protected]>
1 parent d37337f commit 3b90e70

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-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.1
16+
rev: v1.60.3
1717
hooks:
1818
- id: golangci-lint
1919
log_file: .pre-commit.log

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
###############################################################################
1616
# Stage 1: Create the developer image for the BUILDPLATFORM only
1717
###############################################################################
18-
ARG GOLANG_VERSION=1.21
18+
ARG GOLANG_VERSION=1.22
1919
ARG BUILD_BASE=develop
20-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:$GOLANG_VERSION AS develop
20+
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:$GOLANG_VERSION AS develop
2121

2222
ARG PROTOC_VERSION=21.5
2323

@@ -31,8 +31,8 @@ RUN --mount=type=cache,target=/root/.cache/dnf:rw \
3131
nodejs \
3232
python3.11 \
3333
python3.11-pip \
34-
&& ln -sf /usr/bin/python3 /usr/bin/python \
35-
&& ln -sf /usr/bin/pip3 /usr/bin/pip \
34+
&& alternatives --install /usr/bin/python python /usr/bin/python3.11 1 \
35+
&& alternatives --install /usr/bin/pip pip /usr/bin/pip3.11 1 \
3636
&& true
3737

3838
# Install pre-commit
@@ -147,7 +147,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
147147
###############################################################################
148148
# Stage 3: Copy build assets to create the smallest final runtime image
149149
###############################################################################
150-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as runtime
150+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest as runtime
151151

152152
ARG USER=2000
153153

@@ -156,14 +156,14 @@ USER root
156156
# install python to convert keras to tf
157157
# NOTE: tensorflow not supported on PowerPC (ppc64le) or System Z (s390x) https://github.com/tensorflow/tensorflow/issues/46181
158158
RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
159-
microdnf install --setopt=cachedir=/root/.cache/microdnf --setopt=ubi-8-appstream-rpms.module_hotfixes=1 \
159+
microdnf install -y --setopt=cachedir=/root/.cache/microdnf --setopt=ubi-9-appstream-rpms.module_hotfixes=1 \
160160
gcc \
161161
gcc-c++ \
162162
python3.11-devel \
163163
python3.11 \
164164
python3.11-pip \
165-
&& ln -sf /usr/bin/python3 /usr/bin/python \
166-
&& ln -sf /usr/bin/pip3 /usr/bin/pip \
165+
&& alternatives --set python /usr/bin/python3.11 \
166+
&& alternatives --install /usr/bin/pip pip /usr/bin/pip3.11 1 \
167167
&& true
168168

169169
# need to upgrade pip and install wheel before installing grpcio, before installing tensorflow on aarch64

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-runtime-adapter
22

3-
go 1.21
3+
go 1.22.9
44

55
require (
66
cloud.google.com/go/storage v1.28.1

0 commit comments

Comments
 (0)