Skip to content

Commit b3b1469

Browse files
authored
fix(runtimes): add libxcrypt-compat to provide libcrypt.so.1 (#1386)
For this bunch of python 3.12 images it appears that /opt/app-root/lib64/python3.12/site-packages/mysql/vendor/private/sasl2/libplain.so exists and expects libcrypt.so.1 to also exist (if it is to be used at least). I'm not sure why that doesn't exist in the equivalent 3.11 images. It should be noted that libxcrypt-compat is deprecated in RHEL/UBI 9, and how it's used should be considered before deciding to merge this PR. jdanek: I did consider this, looks like it is used by the server-side components of the lib, to compare against hashed passwords in /etc/shadow 🤷
1 parent 28c169d commit b3b1469

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ WORKDIR /opt/app-root/bin
8585
USER root
8686

8787
# Install useful OS packages
88-
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
88+
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
8989

9090
# Copy dynamically-linked mongocli built in earlier build stage
9191
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/

jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ WORKDIR /opt/app-root/bin
203203
USER root
204204

205205
# Install useful OS packages
206-
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
206+
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
207207

208208
# Copy dynamically-linked mongocli built in earlier build stage
209209
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/

jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ WORKDIR /opt/app-root/bin
109109
USER root
110110

111111
# Install useful OS packages
112-
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
112+
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
113113

114114
# Copy dynamically-linked mongocli built in earlier build stage
115115
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/

jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ WORKDIR /opt/app-root/bin
203203
USER root
204204

205205
# Install useful OS packages
206-
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
206+
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
207207

208208
# Copy dynamically-linked mongocli built in earlier build stage
209209
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/

jupyter/trustyai/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ WORKDIR /opt/app-root/bin
7575
USER root
7676

7777
# Install useful OS packages
78-
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all && rm -rf /var/cache/yum
78+
RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
7979

8080
# Copy dynamically-linked mongocli built in earlier build stage
8181
COPY --from=mongocli-builder /tmp/mongocli /opt/app-root/bin/

runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /opt/app-root/bin
99
USER 0
1010

1111
# Install useful OS packages
12-
RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
12+
RUN dnf install -y mesa-libGL skopeo libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
1313

1414
# Other apps and tools installed as default user
1515
USER 1001
@@ -26,7 +26,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/oc
2626
#######################
2727
# runtime-datascience #
2828
#######################
29-
FROM base AS runtime-datascience
29+
FROM base AS runtime-datascience
3030

3131
ARG DATASCIENCE_SOURCE_CODE=runtimes/datascience/ubi9-python-3.12
3232

runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /opt/app-root/bin
99
USER 0
1010

1111
# Install useful OS packages
12-
RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
12+
RUN dnf install -y mesa-libGL skopeo libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
1313

1414
# Other apps and tools installed as default user
1515
USER 1001

runtimes/rocm-pytorch/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /opt/app-root/bin
99
USER 0
1010

1111
# Install useful OS packages
12-
RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
12+
RUN dnf install -y mesa-libGL skopeo libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
1313

1414
# Other apps and tools installed as default user
1515
USER 1001
@@ -38,7 +38,7 @@ ARG AMDGPU_VERSION=6.2.4
3838
# Install the ROCm rpms
3939
# ref: https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-centos-7-complete
4040
# Note: Based on 6.2 above new package mivisionx is a pre-requistes, which bring in more dependent packages
41-
# so we are only installing meta packages of rocm
41+
# so we are only installing meta packages of rocm
4242
# ref: https://rocm.docs.amd.com/projects/install-on-linux/en/develop/reference/package-manager-integration.html#packages-in-rocm-programming-models
4343
RUN echo "[ROCm]" > /etc/yum.repos.d/rocm.repo && \
4444
echo "name=ROCm" >> /etc/yum.repos.d/rocm.repo && \

runtimes/tensorflow/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /opt/app-root/bin
99
USER 0
1010

1111
# Install useful OS packages
12-
RUN dnf install -y mesa-libGL skopeo && dnf clean all && rm -rf /var/cache/yum
12+
RUN dnf install -y mesa-libGL skopeo libxcrypt-compat && dnf clean all && rm -rf /var/cache/yum
1313

1414
# Other apps and tools installed as default user
1515
USER 1001

0 commit comments

Comments
 (0)