Skip to content

Commit c9d06da

Browse files
authored
RHAIENG-1475: enable codeserver on s390x architecture (#1627)
1 parent a2c7d18 commit c9d06da

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ COPY ${CODESERVER_SOURCE_CODE}/devel_env_setup.sh ./
5252
# the final stage with the necessary permissions to consume from cache
5353
RUN --mount=type=cache,target=/root/.cache/uv \
5454
pip install --no-cache uv && \
55-
# the devel script is ppc64le specific - sets up build-time dependencies
55+
# the devel script is ppc64le and s390x specific - sets up build-time dependencies
5656
source ./devel_env_setup.sh && \
5757
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
5858
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
@@ -85,14 +85,12 @@ RUN dnf -y upgrade --refresh --nobest --skip-broken --nodocs --noplugins --setop
8585
# upgrade first to avoid fixable vulnerabilities end
8686

8787
# Install useful OS packages
88-
RUN dnf install -y perl mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
88+
RUN dnf install -y tar perl mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/dnf
8989

9090
# (ARCH-ppc64le): since wheels are compiled from source, we need shared libs available at runtime
9191
RUN --mount=type=cache,from=whl-cache,source=/root/OpenBLAS,target=/OpenBlas,rw \
9292
bash -c ' \
9393
if [[ $(uname -m) == "ppc64le" ]]; then \
94-
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm; \
95-
dnf install -y lcms2 libraqm libimagequant openjpeg2; \
9694
PREFIX=/usr/ make install -C /OpenBlas; \
9795
fi '
9896

@@ -134,9 +132,9 @@ USER 0
134132
WORKDIR /opt/app-root/bin
135133

136134
# Install useful OS packages
137-
RUN dnf install -y jq git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
135+
RUN dnf install -y jq git-lfs libsndfile && dnf clean all && rm -rf /var/cache/dnf
138136

139-
# wait for rpm-base stage (rpm builds for ppc64le)
137+
# wait for rpm-base stage (rpm builds for ppc64le and s390x)
140138
COPY --from=rpm-base /tmp/control /dev/null
141139

142140
# Install code-server
@@ -246,7 +244,7 @@ COPY --from=whl-cache /tmp/control /dev/null
246244
RUN --mount=type=cache,target=/root/.cache/uv \
247245
--mount=type=cache,from=whl-cache,source=/wheelsdir/,target=/wheelsdir/,rw \
248246
bash -c ' \
249-
if [[ $(uname -m) == "ppc64le" ]]; then \
247+
if [[ $(uname -m) == "ppc64le" ]] || [[ $(uname -m) == "s390x" ]]; then \
250248
uv pip install /wheelsdir/*.whl; \
251249
fi '
252250
# install packages as USER 0 (this will allow us to consume uv cache)

0 commit comments

Comments
 (0)