8000 Squashed commit of the following: · heimoshuiyu/llama-cpp-python@e315c19 · GitHub
[go: up one dir, main page]

Skip to content

Commit e315c19

Browse files
committed
Squashed commit of the following:
commit 19e3a54 Merge: ed15d2e 04959f1 Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Sun Jun 23 03:40:28 2024 +0200 Merge branch 'main' into docker commit ed15d2e Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Sun Jun 16 05:11:01 2024 +0200 Update Dockerfile commit 7c086ba Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Sun Jun 16 05:10:28 2024 +0200 Update Dockerfile commit 4db6bb5 Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 16:07:26 2024 +0200 Update build-docker.yaml commit e74b659 Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:43:05 2024 +0200 Update Dockerfile commit c4919f0 Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:42:39 2024 +0200 Update Dockerfile commit 67a314f Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:41:11 2024 +0200 Update Dockerfile commit 2bea4f3 Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:37:03 2024 +0200 Update Dockerfile commit acfd90a Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:36:32 2024 +0200 Update Dockerfile commit 299ad0d Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:36:13 2024 +0200 Update Dockerfile commit 7a1ca4e Author: Olivier DEBAUCHE <olivier.debauche@uliege.be> Date: Fri Jun 14 15:18:44 2024 +0200 Update Dockerfile
1 parent 01bddd6 commit e315c19

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

.github/workflo 10000 ws/build-docker.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ jobs:
2222
- name: Set up Docker Buildx
2323
uses: docker/setup-buildx-action@v3
2424

25+
- name: Login to Docker Hub
26+
uses: docker/login-action@v3
27+
with:
28+
username: ${{ secrets.DOCKERHUB_USERNAME }}
29+
password: ${{ secrets.DOCKERHUB_TOKEN }}
30+
2531
- name: Login to GitHub Container Registry
2632
uses: docker/login-action@v3
2733
with:

docker/cuda_simple/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG CUDA_IMAGE="12.1.1-devel-ubuntu22.04"
1+
ARG CUDA_IMAGE="12.5.0-devel-ubuntu22.04"
22
FROM nvidia/cuda:${CUDA_IMAGE}
33

44
# We need to set the host to 0.0.0.0 to allow outside access

docker/open_llama/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Define the image argument and provide a default value
2-
ARG IMAGE=python:3-slim-bullseye
2+
ARG IMAGE=python:3-slim-bookworm
33

44
# Use the image as specified
55
FROM ${IMAGE}
@@ -12,7 +12,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
1212
python3 \
1313
python3-pip \
1414
ninja-build \
15-
build-essential
15+
build-essential \
16+
&& apt-get clean \
17+
&& rm -rf /var/lib/apt/lists/*
1618

1719
RUN python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
1820

docker/openblas_simple/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
FROM python:3-slim-bullseye
1+
FROM python:3-slim-bookworm
22

33
# We need to set the host to 0.0.0.0 to allow outside access
44
ENV HOST 0.0.0.0
55

66
COPY . .
77

88
# Install the package
9-
RUN apt update && apt install -y libopenblas-dev ninja-build build-essential pkg-config
9+
RUN apt update && apt install -y libopenblas-dev ninja-build build-essential pkg-config \
10+
&& apt-get clean \
11+
&& rm -rf /var/lib/apt/lists/* /tmp/*
12+
1013
RUN python -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
1114

1215
RUN CMAKE_ARGS="-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS" pip install llama_cpp_python --verbose

docker/simple/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Define the image argument and provide a default value
2-
ARG IMAGE=python:3-slim-bullseye
2+
ARG IMAGE=python:3-slim-bookworm
33

44
# Use the image as specified
55
FROM ${IMAGE}
@@ -13,7 +13,9 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
1313
python3-pip \
1414
ninja-build \
1515
libopenblas-dev \
16-
build-essential
16+
build-essential \
17+
&& apt-get clean \
18+
&& rm -rf /var/lib/apt/lists/* /tmp/*
1719

1820
RUN mkdir /app
1921
WORKDIR /app

0 commit comments

Comments
 (0)
0