Skip to content

Commit be81414

Browse files
sandereggsanderegg
committed
fix arm?
1 parent 7c8eb92 commit be81414

File tree

20 files changed

+146
-176
lines changed

20 files changed

+146
-176
lines changed

‎packages/service-integration/Dockerfile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,7 @@ COPY --from=uv_build /uv /uvx /bin/
6666
# packages may be moved to production image easily by copying the venv
6767
RUN uv venv "${VIRTUAL_ENV}"
6868

69-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
70-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
71-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
72-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
73-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
74-
export UV_CONCURRENT_INSTALLS=1; \
75-
fi
69+
7670

7771
RUN --mount=type=cache,target=/root/.cache/uv \
7872
uv pip install --upgrade \

‎services/agent/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66

77
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
8-
# we docker image is built based on debian
9-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
8+
9+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
10+
ENV UV_CONCURRENT_INSTALLS=1
11+
12+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
13+
14+
FROM base-${TARGETARCH} AS base
1015

1116

1217
#
@@ -87,13 +92,7 @@ COPY --from=uv_build /uv /uvx /bin/
8792
# packages may be moved to production image easily by copying the venv
8893
RUN uv venv "${VIRTUAL_ENV}"
8994

90-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
91-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
92-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
93-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
94-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
95-
export UV_CONCURRENT_INSTALLS=1; \
96-
fi
95+
9796

9897
RUN --mount=type=cache,target=/root/.cache/uv \
9998
uv pip install --upgrade \

‎services/api-server/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914
#
1015
# USAGE:
1116
# cd sercices/api-server
@@ -80,13 +85,7 @@ COPY --from=uv_build /uv /uvx /bin/
8085
# packages may be moved to production image easily by copying the venv
8186
RUN uv venv "${VIRTUAL_ENV}"
8287

83-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
84-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
85-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
86-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
87-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
88-
export UV_CONCURRENT_INSTALLS=1; \
89-
fi
88+
9089

9190
RUN --mount=type=cache,target=/root/.cache/uv \
9291
uv pip install --upgrade \

‎services/autoscaling/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914

1015
#
1116
# USAGE:
@@ -100,13 +105,7 @@ COPY --from=uv_build /uv /uvx /bin/
100105
# packages may be moved to production image easily by copying the venv
101106
RUN uv venv "${VIRTUAL_ENV}"
102107

103-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
104-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
105-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
106-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
107-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
108-
export UV_CONCURRENT_INSTALLS=1; \
109-
fi
108+
110109

111110
RUN --mount=type=cache,target=/root/.cache/uv \
112111
uv pip install --upgrade \

‎services/catalog/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914
#
1015
#
1116
# USAGE:
@@ -81,13 +86,7 @@ COPY --from=uv_build /uv /uvx /bin/
8186
# packages may be moved to production image easily by copying the venv
8287
RUN uv venv "${VIRTUAL_ENV}"
8388

84-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
85-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
86-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
87-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
88-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
89-
export UV_CONCURRENT_INSTALLS=1; \
90-
fi
89+
9190

9291
RUN --mount=type=cache,target=/root/.cache/uv \
9392
uv pip install --upgrade \

‎services/clusters-keeper/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914

1015
#
1116
# USAGE:
@@ -99,13 +104,7 @@ COPY --from=uv_build /uv /uvx /bin/
99104
# packages may be moved to production image easily by copying the venv
100105
RUN uv venv "${VIRTUAL_ENV}"
101106

102-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
103-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
104-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
105-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
106-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
107-
export UV_CONCURRENT_INSTALLS=1; \
108-
fi
107+
109108

110109
RUN --mount=type=cache,target=/root/.cache/uv \
111110
uv pip install --upgrade \

‎services/dask-sidecar/Dockerfile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,7 @@ COPY --from=uv_build /uv /uvx /bin/
9090
# NOTE: python virtualenv is used here such that installed packages may be moved to production image easily by copying the venv
9191
RUN uv venv "${VIRTUAL_ENV}"
9292

93-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
94-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
95-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
96-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
97-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
98-
export UV_CONCURRENT_INSTALLS=1; \
99-
fi
93+
10094

10195
RUN --mount=type=cache,target=/root/.cache/uv \
10296
uv pip install --upgrade \

‎services/datcore-adapter/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914

1015
#
1116
# USAGE:
@@ -81,13 +86,7 @@ COPY --from=uv_build /uv /uvx /bin/
8186
# packages may be moved to production image easily by copying the venv
8287
RUN uv venv "${VIRTUAL_ENV}"
8388

84-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
85-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
86-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
87-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
88-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
89-
export UV_CONCURRENT_INSTALLS=1; \
90-
fi
89+
9190

9291
RUN --mount=type=cache,target=/root/.cache/uv \
9392
uv pip install --upgrade \

‎services/director-v2/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914

1015
#
1116
# USAGE:
@@ -81,13 +86,7 @@ COPY --from=uv_build /uv /uvx /bin/
8186
# packages may be moved to production image easily by copying the venv
8287
RUN uv venv "${VIRTUAL_ENV}"
8388

84-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
85-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
86-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
87-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
88-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
89-
export UV_CONCURRENT_INSTALLS=1; \
90-
fi
89+
9190

9291
RUN --mount=type=cache,target=/root/.cache/uv \
9392
uv pip install --upgrade \

‎services/director/Dockerfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.6"
66
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
7-
# we docker image is built based on debian
8-
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
7+
8+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-arm64
9+
ENV UV_CONCURRENT_INSTALLS=1
10+
11+
FROM python:${PYTHON_VERSION}-slim-bookworm AS base-amd64
12+
13+
FROM base-${TARGETARCH} AS base
914

1015
#
1116
# USAGE:
@@ -81,13 +86,7 @@ COPY --from=uv_build /uv /uvx /bin/
8186
# packages may be moved to production image easily by copying the venv
8287
RUN uv venv "${VIRTUAL_ENV}"
8388

84-
# Set UV_CONCURRENT_INSTALLS=1 for ARM64 to improve build performance
85-
# These environment variables are necessary because of https://github.com/astral-sh/uv/issues/6105
86-
# and until https://gitlab.com/qemu-project/qemu/-/issues/2846 gets fixed
87-
RUN if [ "$TARGETARCH" = "arm64" ]; then \
88-
echo "Setting UV_CONCURRENT_INSTALLS=1 for ARM64 architecture"; \
89-
export UV_CONCURRENT_INSTALLS=1; \
90-
fi
89+
9190

9291
RUN --mount=type=cache,target=/root/.cache/uv \
9392
uv pip install --upgrade \

0 commit comments

Comments
 (0)