Skip to content

Commit 20c5266

Browse files
authored
docker: specify registry to simplify Podman builds (#24607)
1 parent fd5869f commit 20c5266

10 files changed

Lines changed: 19 additions & 19 deletions

.devops/cpu.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ubuntu:$UBUNTU_VERSION AS build
6+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
77

88
ARG TARGETARCH
99

@@ -37,7 +37,7 @@ RUN mkdir -p /app/full \
3737
&& cp .devops/tools.sh /app/full/tools.sh
3838

3939
## Base image
40-
FROM ubuntu:$UBUNTU_VERSION AS base
40+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
4141

4242
ARG BUILD_DATE=N/A
4343
ARG APP_VERSION=N/A

.devops/cuda.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ ARG UBUNTU_VERSION=24.04
33
ARG CUDA_VERSION=12.8.1
44
ARG GCC_VERSION=14
55
# Target the CUDA build image
6-
ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
6+
ARG BASE_CUDA_DEV_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
77

8-
ARG BASE_CUDA_RUN_CONTAINER=nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
8+
ARG BASE_CUDA_RUN_CONTAINER=docker.io/nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}
99

1010
ARG BUILD_DATE=N/A
1111
ARG APP_VERSION=N/A

.devops/intel.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG APP_REVISION=N/A
55

66
## Build Image
77

8-
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS build
8+
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS build
99

1010
ARG GGML_SYCL_F16=OFF
1111
ARG LEVEL_ZERO_VERSION=1.28.2
@@ -42,7 +42,7 @@ RUN mkdir -p /app/full \
4242
&& cp requirements.txt /app/full \
4343
&& cp .devops/tools.sh /app/full/tools.sh
4444

45-
FROM intel/deep-learning-essentials:$ONEAPI_VERSION AS base
45+
FROM docker.io/intel/deep-learning-essentials:$ONEAPI_VERSION AS base
4646

4747
ARG BUILD_DATE=N/A
4848
ARG APP_VERSION=N/A

.devops/llama-cli-cann.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ascendai/cann:$ASCEND_VERSION AS build
6+
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS build
77

88
WORKDIR /app
99

@@ -30,7 +30,7 @@ RUN echo "Building with static libs" && \
3030
cmake --build build --config Release --target llama-completion
3131

3232
# TODO: use image with NNRT
33-
FROM ascendai/cann:$ASCEND_VERSION AS runtime
33+
FROM docker.io/ascendai/cann:$ASCEND_VERSION AS runtime
3434

3535
ARG BUILD_DATE=N/A
3636
ARG APP_VERSION=N/A

.devops/musa.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARG UBUNTU_VERSION=22.04
22
# This needs to generally match the container host's environment.
33
ARG MUSA_VERSION=rc4.3.0
44
# Target the MUSA build image
5-
ARG BASE_MUSA_DEV_CONTAINER=mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
5+
ARG BASE_MUSA_DEV_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-devel-ubuntu${UBUNTU_VERSION}-amd64
66

7-
ARG BASE_MUSA_RUN_CONTAINER=mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
7+
ARG BASE_MUSA_RUN_CONTAINER=docker.io/mthreads/musa:${MUSA_VERSION}-runtime-ubuntu${UBUNTU_VERSION}-amd64
88

99
ARG BUILD_DATE=N/A
1010
ARG APP_VERSION=N/A

.devops/openvino.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ARG APP_VERSION=N/A
2323
ARG APP_REVISION=N/A
2424

2525
## Build Image
26-
FROM ubuntu:${UBUNTU_VERSION} AS build
26+
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS build
2727

2828
# Pass proxy args to build stage
2929
ARG http_proxy
@@ -88,7 +88,7 @@ RUN mkdir -p /app/full \
8888
&& cp .devops/tools.sh /app/full/tools.sh
8989

9090
## Base Runtime Image
91-
FROM ubuntu:${UBUNTU_VERSION} AS base
91+
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS base
9292

9393
# Pass proxy args to runtime stage
9494
ARG http_proxy

.devops/rocm.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG ROCM_VERSION=7.2.1
55
ARG AMDGPU_VERSION=7.2.1
66

77
# Target the ROCm build image
8-
ARG BASE_ROCM_DEV_CONTAINER=rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
8+
ARG BASE_ROCM_DEV_CONTAINER=docker.io/rocm/dev-ubuntu-${UBUNTU_VERSION}:${ROCM_VERSION}-complete
99

1010
ARG BUILD_DATE=N/A
1111
ARG APP_VERSION=N/A

.devops/s390x.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG APP_VERSION=N/A
55
ARG APP_REVISION=N/A
66

77
### Build Llama.cpp stage
8-
FROM gcc:${GCC_VERSION} AS build
8+
FROM docker.io/gcc:${GCC_VERSION} AS build
99

1010
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
1111
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -55,7 +55,7 @@ COPY --from=build /opt/llama.cpp/conversion /llama.cpp/conversion
5555

5656

5757
### Base image
58-
FROM ubuntu:${UBUNTU_VERSION} AS base
58+
FROM docker.io/ubuntu:${UBUNTU_VERSION} AS base
5959

6060
ARG BUILD_DATE=N/A
6161
ARG APP_VERSION=N/A

.devops/vulkan.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ubuntu:$UBUNTU_VERSION AS build
6+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
77

88
# Install build tools
99
RUN apt update && apt install -y git build-essential cmake wget xz-utils
@@ -33,7 +33,7 @@ RUN mkdir -p /app/full \
3333
&& cp .devops/tools.sh /app/full/tools.sh
3434

3535
## Base image
36-
FROM ubuntu:$UBUNTU_VERSION AS base
36+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
3737

3838
ARG BUILD_DATE=N/A
3939
ARG APP_VERSION=N/A

.devops/zendnn.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG BUILD_DATE=N/A
33
ARG APP_VERSION=N/A
44
ARG APP_REVISION=N/A
55

6-
FROM ubuntu:$UBUNTU_VERSION AS build
6+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS build
77

88
RUN apt-get update && \
99
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 \
3030
&& cp .devops/tools.sh /app/full/tools.sh
3131

3232
## Base image
33-
FROM ubuntu:$UBUNTU_VERSION AS base
33+
FROM docker.io/ubuntu:$UBUNTU_VERSION AS base
3434

3535
ARG BUILD_DATE=N/A
3636
ARG APP_VERSION=N/A

0 commit comments

Comments
 (0)