mirror of
https://github.com/containers/ramalama.git
synced 2026-02-05 06:46:39 +01:00
Merge pull request #2247 from olliewalsh/revert_cudacompat_ldconfig
Revert "Workaround for CUDA image not pointing to libcuda.so.1 in ld.so.conf"
This commit is contained in:
2
Makefile
2
Makefile
@@ -7,7 +7,7 @@ SHAREDIR ?= ${PREFIX}/share
|
||||
PYTHON ?= $(shell command -v python3 python|head -n1)
|
||||
DESTDIR ?= /
|
||||
PATH := $(PATH):$(HOME)/.local/bin
|
||||
MYPIP ?= uv pip
|
||||
MYPIP ?= pip
|
||||
IMAGE ?= ramalama
|
||||
PROJECT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||
EXCLUDE_DIRS := .venv venv .tox build
|
||||
|
||||
@@ -14,9 +14,6 @@ FROM docker.io/nvidia/cuda:${CUDA_VERSION}-runtime-ubi9
|
||||
# Copy the entire installation directory from the builder
|
||||
COPY --from=builder /tmp/install /usr
|
||||
|
||||
# Workaround for CUDA libraries not in the ld path in base container
|
||||
RUN echo "/usr/local/cuda-12.8/compat" > /etc/ld.so.conf.d/99_cuda_compat.conf && ldconfig
|
||||
|
||||
# Install python3.12 and ramalama to support a non-standard use-case
|
||||
RUN dnf -y install python3.12 && dnf -y clean all && ln -sf python3.12 /usr/bin/python3
|
||||
COPY . /src/ramalama
|
||||
|
||||
@@ -121,13 +121,13 @@ load setup_suite
|
||||
run_ramalama convert --type artifact file://$RAMALAMA_TMPDIR/testmodel oci://$registry/artifact-test-push:latest
|
||||
run_ramalama list
|
||||
is "$output" ".*$registry/artifact-test-push.*latest" "artifact was pushed and listed"
|
||||
run_ramalama push --type artifact oci://$registry/artifact-test-push:latest
|
||||
run_ramalama push --tls-verify=false --type artifact oci://$registry/artifact-test-push:latest
|
||||
|
||||
# Verify it's an artifact
|
||||
run_podman artifact ls
|
||||
is "$output" ".*$registry/artifact-test-push" "pushed artifact appears in podman artifact list"
|
||||
|
||||
run_ramalama rm oci://$registry/artifact-test-push:latest file://${testmodel}
|
||||
run_ramalama rm oci://$registry/artifact-test-push:latest file://$RAMALAMA_TMPDIR/testmodel
|
||||
|
||||
run_ramalama ls
|
||||
assert "$output" !~ ".*$registry/artifact-test-push" "pushed artifact was removed"
|
||||
|
||||
Reference in New Issue
Block a user