andreas/llama-swap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update container build action

Browse Source
This commit is contained in:
Benson Wong
2025-02-18 09:59:06 -08:00
parent f5a2be698d
commit 4ed58fb173
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/containers.yml vendored
View File

@@ -3,7 +3,7 @@ name: Build Containers
on: on:
# time has no specific meaning, trying to time it after # time has no specific meaning, trying to time it after
# the llama.cpp daily packages are published # the llama.cpp daily packages are published
# https://github.com/ggerganov/llama.cpp/blob/master/.github/workflows/docker.yml # https://github.com/ggml-org/llama.cpp/blob/master/.github/workflows/docker.yml
schedule: schedule:
- cron: "37 5 * * *" - cron: "37 5 * * *"
@@ -31,4 +31,4 @@ jobs:
- name: Run build-container - name: Run build-container
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./docker/build-container.sh ${{ matrix.platform }} run: ./docker/build-container.sh ${{ matrix.platform }} true

13
docker/build-container.sh
View File

@@ -3,6 +3,7 @@
cd $(dirname "$0") cd $(dirname "$0")
ARCH=$1 ARCH=$1
PUSH_IMAGES=${2:-false}
# List of allowed architectures # List of allowed architectures
ALLOWED_ARCHS=("intel" "vulkan" "musa" "cuda" "cpu") ALLOWED_ARCHS=("intel" "vulkan" "musa" "cuda" "cpu")
@@ -28,10 +29,12 @@ if [ "$ARCH" == "cpu" ]; then
CONTAINER_LATEST="ghcr.io/mostlygeek/llama-swap:cpu" CONTAINER_LATEST="ghcr.io/mostlygeek/llama-swap:cpu"
echo "Building ${CONTAINER_LATEST} $LS_VER" echo "Building ${CONTAINER_LATEST} $LS_VER"
docker build -f llama-swap.Containerfile --build-arg BASE_TAG=server --build-arg LS_VER=${LS_VER} -t ${CONTAINER_LATEST} . docker build -f llama-swap.Containerfile --build-arg BASE_TAG=server --build-arg LS_VER=${LS_VER} -t ${CONTAINER_LATEST} .
docker push ${CONTAINER_LATEST} if [ "$PUSH_IMAGES" == "true" ]; then
docker push ${CONTAINER_LATEST}
fi
else else
LCPP_TAG=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \ LCPP_TAG=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/users/ggerganov/packages/container/llama.cpp/versions" \ "https://api.github.com/users/ggml-org/packages/container/llama.cpp/versions" \
| jq -r --arg arch "$ARCH" '.[] | select(.metadata.container.tags[] | startswith("server-\($arch)")) | .metadata.container.tags[]' \ | jq -r --arg arch "$ARCH" '.[] | select(.metadata.container.tags[] | startswith("server-\($arch)")) | .metadata.container.tags[]' \
| sort -r | head -n1 | awk -F '-' '{print $3}') | sort -r | head -n1 | awk -F '-' '{print $3}')
@@ -39,6 +42,8 @@ else
CONTAINER_LATEST="ghcr.io/mostlygeek/llama-swap:${ARCH}" CONTAINER_LATEST="ghcr.io/mostlygeek/llama-swap:${ARCH}"
echo "Building ${CONTAINER_TAG} $LS_VER" echo "Building ${CONTAINER_TAG} $LS_VER"
docker build -f llama-swap.Containerfile --build-arg BASE_TAG=server-${ARCH}-${LCPP_TAG} --build-arg LS_VER=${LS_VER} -t ${CONTAINER_TAG} -t ${CONTAINER_LATEST} . docker build -f llama-swap.Containerfile --build-arg BASE_TAG=server-${ARCH}-${LCPP_TAG} --build-arg LS_VER=${LS_VER} -t ${CONTAINER_TAG} -t ${CONTAINER_LATEST} .
docker push ${CONTAINER_TAG} if [ "$PUSH_IMAGES" == "true" ]; then
docker push ${CONTAINER_LATEST} docker push ${CONTAINER_TAG}
docker push ${CONTAINER_LATEST}
fi
fi fi

2
docker/llama-swap.Containerfile
View File

@@ -1,5 +1,5 @@
ARG BASE_TAG=server-cuda ARG BASE_TAG=server-cuda
FROM ghcr.io/ggerganov/llama.cpp:${BASE_TAG} FROM ghcr.io/ggml-org/llama.cpp:${BASE_TAG}
# has to be after the FROM # has to be after the FROM
ARG LS_VER=89 ARG LS_VER=89