docker: specify registry to simplify Podman builds (#24607)
This commit is contained in:
committed by
GitHub
parent
fd5869fb62
commit
20c5266f8a
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
|
|||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS build
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
|
||||||
|
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ RUN mkdir -p /app/full \
|
|||||||
&& cp .devops/tools.sh /app/full/tools.sh
|
&& cp .devops/tools.sh /app/full/tools.sh
|
||||||
|
|
||||||
## Base image
|
## Base image
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS base
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ ARG UBUNTU_VERSION=24.04
|
|||||||
ARG CUDA_VERSION=12.8.1
|
ARG CUDA_VERSION=12.8.1
|
||||||
ARG GCC_VERSION=14
|
ARG GCC_VERSION=14
|
||||||
# Target the CUDA build image
|
# Target the CUDA build image
|
||||||
ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
|
ARG BASE_CUDA_DEV_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
|
||||||
|
|
||||||
ARG BASE_CUDA_RUN_CONTAINER=nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
|
ARG BASE_CUDA_RUN_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ ARG APP_REVISION=N/A
|
|||||||
|
|
||||||
## Build Image
|
## Build Image
|
||||||
|
|
||||||
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS build
|
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS build
|
||||||
|
|
||||||
ARG GGML_SYCL_F16=OFF
|
ARG GGML_SYCL_F16=OFF
|
||||||
ARG LEVEL_ZERO_VERSION=1.28.2
|
ARG LEVEL_ZERO_VERSION=1.28.2
|
||||||
@@ -42,7 +42,7 @@ RUN mkdir -p /app/full \
|
|||||||
&& cp requirements.txt /app/full \
|
&& cp requirements.txt /app/full \
|
||||||
&& cp .devops/tools.sh /app/full/tools.sh
|
&& cp .devops/tools.sh /app/full/tools.sh
|
||||||
|
|
||||||
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS base
|
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS base
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
|
|||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
FROM ascendai/cann:$ASCEND_VERSION AS build
|
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS build
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ RUN echo "Building with static libs" && \
|
|||||||
cmake --build build --config Release --target llama-completion
|
cmake --build build --config Release --target llama-completion
|
||||||
|
|
||||||
# TODO: use image with NNRT
|
# TODO: use image with NNRT
|
||||||
FROM ascendai/cann:$ASCEND_VERSION AS runtime
|
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS runtime
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ ARG UBUNTU_VERSION=22.04
|
|||||||
# This needs to generally match the container host's environment.
|
# This needs to generally match the container host's environment.
|
||||||
ARG MUSA_VERSION=rc4.3.0
|
ARG MUSA_VERSION=rc4.3.0
|
||||||
# Target the MUSA build image
|
# Target the MUSA build image
|
||||||
ARG BASE_MUSA_DEV_CONTAINER=mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
|
ARG BASE_MUSA_DEV_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
|
||||||
|
|
||||||
ARG BASE_MUSA_RUN_CONTAINER=mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
|
ARG BASE_MUSA_RUN_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ ARG APP_VERSION=N/A
|
|||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
## Build Image
|
## Build Image
|
||||||
FROM ubuntu:${UBUNTU_VERSION} AS build
|
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS build
|
||||||
|
|
||||||
# Pass proxy args to build stage
|
# Pass proxy args to build stage
|
||||||
ARG http_proxy
|
ARG http_proxy
|
||||||
@@ -88,7 +88,7 @@ RUN mkdir -p /app/full \
|
|||||||
&& cp .devops/tools.sh /app/full/tools.sh
|
&& cp .devops/tools.sh /app/full/tools.sh
|
||||||
|
|
||||||
## Base Runtime Image
|
## Base Runtime Image
|
||||||
FROM ubuntu:${UBUNTU_VERSION} AS base
|
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS base
|
||||||
|
|
||||||
# Pass proxy args to runtime stage
|
# Pass proxy args to runtime stage
|
||||||
ARG http_proxy
|
ARG http_proxy
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ ARG ROCM_VERSION=7.2.1
|
|||||||
ARG AMDGPU_VERSION=7.2.1
|
ARG AMDGPU_VERSION=7.2.1
|
||||||
|
|
||||||
# Target the ROCm build image
|
# Target the ROCm build image
|
||||||
ARG BASE_ROCM_DEV_CONTAINER=rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
|
ARG BASE_ROCM_DEV_CONTAINER=docker.io/rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ ARG APP_VERSION=N/A
|
|||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
### Build Llama.cpp stage
|
### Build Llama.cpp stage
|
||||||
FROM gcc:${GCC_VERSION} AS build
|
FROM docker.io/gcc:${GCC_VERSION} AS build
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||||
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
|
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
|
||||||
@@ -55,7 +55,7 @@ COPY --from=build /opt/llama.cpp/conversion /llama.cpp/conversion
|
|||||||
|
|
||||||
|
|
||||||
### Base image
|
### Base image
|
||||||
FROM ubuntu:${UBUNTU_VERSION} AS base
|
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS base
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
|
|||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS build
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
|
||||||
|
|
||||||
# Install build tools
|
# Install build tools
|
||||||
RUN apt update && apt install -y git build-essential cmake wget xz-utils
|
RUN apt update && apt install -y git build-essential cmake wget xz-utils
|
||||||
@@ -33,7 +33,7 @@ RUN mkdir -p /app/full \
|
|||||||
&& cp .devops/tools.sh /app/full/tools.sh
|
&& cp .devops/tools.sh /app/full/tools.sh
|
||||||
|
|
||||||
## Base image
|
## Base image
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS base
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
|
|||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
ARG APP_REVISION=N/A
|
ARG APP_REVISION=N/A
|
||||||
|
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS build
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y gcc-13 g++-13 build-essential git cmake libssl-dev libomp-dev libnuma-dev python3 ca-certificates
|
apt-get install -y gcc-13 g++-13 build-essential git cmake libssl-dev libomp-dev libnuma-dev python3 ca-certificates
|
||||||
@@ -30,7 +30,7 @@ RUN mkdir -p /app/full \
|
|||||||
&& cp .devops/tools.sh /app/full/tools.sh
|
&& cp .devops/tools.sh /app/full/tools.sh
|
||||||
|
|
||||||
## Base image
|
## Base image
|
||||||
FROM ubuntu:$UBUNTU_VERSION AS base
|
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
|
||||||
|
|
||||||
ARG BUILD_DATE=N/A
|
ARG BUILD_DATE=N/A
|
||||||
ARG APP_VERSION=N/A
|
ARG APP_VERSION=N/A
|
||||||
|
|||||||
Reference in New Issue
Block a user