mirror of
https://github.com/ikawrakow/ik_llama.cpp.git
synced 2026-06-28 04:30:15 -05:00
db31e7d803
* ci: implement build matrix for CUDA/CPU containers with dynamic tagging * fix: Updated Docker images/build-container.yml * fix: Updated the documentation about Docker * fix: Set Arch for 3090s * fix: Updated build step name. * fix: Set target ARCH as a variable * feat: Added cleanup step * feat: Added docker-bake and updated workflow * fix: Issue with REPO_OWNER variable * fix: Updated workflow to solve errors * fix: Updated branch format * fix: Wrong naming * Update docker-bake.hcl * Update build-container.yml * Update ik_llama-cuda.Containerfile * Update ik_llama-cpu.Containerfile * Update docker-bake.hcl * Update build-container.yml * Removed action/cache * added -sSL for reliability and fixed the URL path * added -sSL for reliability and fixed the URL path CUDA containerfile * fix: correct Dockerfile RUN command syntax errors - Combine split apt-get install commands in both Containerfiles - Fix broken cmake command continuation in ik_llama-cuda.Containerfile * fix: correct llama-swap download URL in Containerfiles - Fix broken line continuation in curl download URL for llama-swap * perf: improve ccache configuration in Containerfiles - Add CCACHE_UMASK=000 for cache accessibility across stages - Add CCACHE_MAXSIZE=1G to prevent unbounded growth - Initialize ccache with ccache -i during build stage * fix: remove problematic ccache initialization from Containerfiles - ccache -i fails because CCACHE_DIR mount doesn't exist yet at build time * fix: add git to CPU Containerfile build dependencies - Resolves CMake warning about missing Git for build info * chore: optimize Containerfile with smaller images and better healthchecks - Add --no-install-recommends to all apt-get commands for smaller image size - Add ca-certificates to base stage for HTTPS support - Merge redundant build copy commands from 3 layers to 1 - Fix llama-swap version from 198 to v199 (latest release) - Add HEALTHCHECK configuration with interval/timeout/retries to server and swap stages - Copy /app/lib in server stage to fix container startup * chore: fix CUDA Containerfile healthchecks and swap version - Add /app/lib copy in server stage to fix container startup - Fix llama-swap version from 198 to v199 (latest release) - Add HEALTHCHECK configuration with interval/timeout/retries * chore: fix indentation in Containerfiles and add LD_LIBRARY_PATH for server target * fix: add --break-system-packages flag for pip in CPU Containerfile * feat: add git bind mount for build info and NCCL support for CUDA * fix: remove libnccl-dev from CUDA build (already included in base image) * fix: added Markdown files to ignore files * feat: use BUILD_NUMBER-COMMIT pattern for docker image tags - Add BUILD_NUMBER and LLAMA_COMMIT to build workflow - Update docker-bake.hcl to use version tag format matching llama-server --version output - Format: VARIANT-BUILD_NUMBER-COMMIT (e.g., cu12-full-4406-3bc90dfd) * fix: fetch full git history for accurate BUILD_NUMBER - Add fetch-depth: 0 to actions/checkout to get all commits - This ensures git rev-list --count HEAD returns correct total commit count * fix: fetch full git history in Dockerfile for accurate BUILD_NUMBER - Add git fetch --unshallow to get complete commit history during build - This ensures build-info.cpp is generated with correct LLAMA_BUILD_NUMBER * chore: update GitHub Actions to latest versions for Node.js 24 compatibility - docker/setup-buildx-action@v3 -> v4 - docker/login-action@v3 -> v4 * chore: update all GitHub Actions to Node.js 24 compatible versions - actions/checkout@v4 -> v6 - docker/setup-buildx-action@v3 -> v5 - docker/login-action@v3 -> v6 - docker/bake-action@v5 -> v7 * fix: use CI-passed BUILD_NUMBER and LLAMA_COMMIT in Dockerfile - Add BUILD_NUMBER and LLAMA_COMMIT as build args - Fall back to git commands if not provided - Pass values explicitly to cmake for accurate build info * fix: pass BUILD_NUMBER and LLAMA_COMMIT as Docker build args - Add BUILD_NUMBER and LLAMA_COMMIT to docker bake args - These will be used by the Containerfile for accurate build info * fix: revert docker actions to v4 (latest available versions) * fix: calculate BUILD_NUMBER and LLAMA_COMMIT directly in Containerfile - Removed ARG defaults since we calculate from git during build - Use git rev-list --count HEAD and git rev-parse for accurate version info - Falls back to 0/unknown if git commands fail * feat: calculate BUILD_NUMBER and LLAMA_COMMIT in Containerfiles - Add git-based version calculation in both CPU and CUDA Containerfiles - Remove .git bind mount (git is copied with COPY .) - Pass build info to CMake for accurate llama-server --version output * feat: calculate BUILD_NUMBER and LLAMA_COMMIT in Containerfiles - Add git-based version calculation using git rev-list and git rev-parse - Copy .git directory separately to ensure git commands work during build - Pass build info to CMake for accurate llama-server --version output * fix: cache improvements for CUDA and CPU builds * fix: "/.git": not found * fix: Unnecessary mv llama-swap * fix: Remove BUILD_NUMBER and LLAMA_COMMIT from docker file, calculated by cmake proc * fix: remove .git from dockerignore for local and CI builds - Enables cmake to access .git directory during Docker build - Required for version calculation in llama-server binary - GitHub Actions uses explicit mount via bake action set parameter * fix: Remove mounts key from Build and Push step in gh workflow * ci: add .git verification step before build * refactor: standardize Containerfile structure and remove .git mount dependency - Remove --mount=type=bind,source=.git,target=.git from both Containerfiles - Replace COPY . . with git clone for cleaner build context - Add CUSTOM_COMMIT ARG for optional custom commit switching - Standardize ARG/ENV ordering and comment formatting across CPU/CUDA variants - Install ca-certificates before git clone to fix SSL verification issues - Rename 'Structured artifact collection' to 'Collect build artifacts' * ci: remove broken cache pruning step * ci: remove broken prune-cache job - Remove prune-cache job that was failing due to missing .git directory - The job required a checkout step and the cache pruning logic was non-critical * chore: Removed step for Verifying .git existance in GH workflow * fix: ensure build always proceeds even if git switch fails - Add '|| true' to git switch command so build continues on failure - This prevents the entire RUN step from failing when CUSTOM_COMMIT is invalid * fix: resolve Docker build pipeline issues - Remove external git clone from Containerfiles, use build context directly - Add BUILD_NUMBER and BUILD_COMMIT as CMake cache variables in build-info.cmake - Fix .devops/tools.sh inclusion by using explicit COPY for hidden directories - Set USE_CCACHE=true for CI builds - Clean up unused SHA_SHORT variable from docker-bake.hcl Fixes: Build steps were cached incorrectly due to external git clone ignoring the actual build context source. * fix: include .git in Docker build context and add verification * ci: add .git directory verification step after checkout * build: fix .git mount path for Docker build context compatibility * build: fix .git mount path for Docker build context compatibility * docker: include .git in build context for version calculation * ci: add .git directory verification step after checkout * chore: Removed unecessary Verify .git step (It was a test) * docs: update README with docker-bake and build-local.sh instructions * docs: remove build-local.sh reference (not in repo) * ci: optimize disk usage by limiting fetch depth and cleaning workspace --------- Co-authored-by: HP Prodesk <sourceupdev@gmail.com>
94 lines
3.0 KiB
Plaintext
94 lines
3.0 KiB
Plaintext
ARG UBUNTU_VERSION=24.04
|
|
|
|
# Stage 1: Build
|
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
|
|
|
|
# Build arguments
|
|
ARG GGML_NATIVE=ON
|
|
ARG GGML_AVX2=ON
|
|
ARG USE_CCACHE=true
|
|
|
|
# Environment variables for portability and GitHub Actions
|
|
ENV LLAMA_CURL=1
|
|
ENV LC_ALL=C.utf8
|
|
|
|
# ccache configuration
|
|
ENV CCACHE_DIR=/ccache
|
|
ENV CCACHE_MAXSIZE=1G
|
|
ENV CCACHE_COMPRESS=1
|
|
ENV CCACHE_COMPRESSLEVEL=6
|
|
# This is CRITICAL for GitHub Actions: it ignores the absolute path of the runner
|
|
ENV CCACHE_BASEDIR=/app
|
|
|
|
RUN apt-get update && \
|
|
apt-get install -yq --no-install-recommends ca-certificates build-essential libcurl4-openssl-dev curl libgomp1 cmake ccache git && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# Copy source code (excluding hidden files/dirs via .dockerignore)
|
|
COPY . /app
|
|
|
|
WORKDIR /app
|
|
|
|
# Build using ccache and optional custom commit
|
|
RUN --mount=type=cache,target=/ccache \
|
|
--mount=type=bind,source=.git,target=.git \
|
|
if [ "${USE_CCACHE}" = "true" ]; then \
|
|
export PATH="/usr/lib/ccache:$PATH"; \
|
|
ccache -z; \
|
|
fi && \
|
|
cmake -B build \
|
|
-DGGML_NATIVE=${GGML_NATIVE} \
|
|
-DLLAMA_CURL=ON && \
|
|
cmake --build build --config Release -j$(nproc) && \
|
|
if [ "${USE_CCACHE}" = "true" ]; then \
|
|
ccache -s; \
|
|
fi
|
|
|
|
# Collect build artifacts
|
|
RUN mkdir -p /app/dist/lib /app/dist/full /app/dist/bin && \
|
|
find build -name "*.so" -exec cp {} /app/dist/lib \; && \
|
|
cp build/bin/* /app/dist/bin/ && \
|
|
cp build/bin/* /app/dist/full/ && \
|
|
cp *.py /app/dist/full/ && \
|
|
cp -r gguf-py /app/dist/full/ && \
|
|
cp -r requirements /app/dist/full/ && \
|
|
cp requirements.txt /app/dist/full/ && \
|
|
cp .devops/tools.sh /app/dist/full/
|
|
|
|
# Stage 2: Base (Shared Runtime)
|
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
|
|
RUN apt-get update && \
|
|
apt-get install -yq --no-install-recommends libgomp1 curl ca-certificates && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
WORKDIR /app
|
|
ENV LD_LIBRARY_PATH=/app/lib
|
|
COPY --from=build /app/dist/lib /app/lib
|
|
|
|
# Stage 3: Full (Python/Dev Tools)
|
|
FROM base AS full
|
|
COPY --from=build /app/dist/full /app
|
|
RUN apt-get update && \
|
|
apt-get install -yq --no-install-recommends git python3 python3-pip && \
|
|
pip install --break-system-packages -r requirements.txt && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
ENTRYPOINT ["/app/tools.sh"]
|
|
|
|
# Stage 4: Server
|
|
FROM base AS server
|
|
ENV LLAMA_ARG_HOST=0.0.0.0
|
|
COPY --from=build /app/dist/bin/llama-server /app/llama-server
|
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
|
CMD [ "curl", "-f", "http://localhost:8080/health" ]
|
|
ENTRYPOINT [ "/app/llama-server" ]
|
|
|
|
# Stage 5: Swap
|
|
FROM server AS swap
|
|
ARG LS_REPO=mostlygeek/llama-swap
|
|
ARG LS_VER=199
|
|
RUN curl -sSL "https://github.com/${LS_REPO}/releases/download/v${LS_VER}/llama-swap_${LS_VER}_linux_amd64.tar.gz" \
|
|
| tar -xz
|
|
|
|
COPY --from=build /app/docker/ik_llama-cpu-swap.config.yaml /app/config.yaml
|
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
|
CMD [ "curl", "-f", "http://localhost:8080"]
|
|
ENTRYPOINT [ "/app/llama-swap", "-config", "/app/config.yaml" ] |