Skip to content

Commit 60a333e

Browse files
committed
install right architecture
1 parent c36438e commit 60a333e

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

services/agent/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
# Define arguments in the global scope
44
ARG PYTHON_VERSION="3.11.9"
55
ARG UV_VERSION="0.4"
6+
67
FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
78
# we docker image is built based on debian
89
FROM python:${PYTHON_VERSION}-slim-bookworm AS base
910

11+
1012
#
1113
# USAGE:
1214
# cd sercices/agent
@@ -57,6 +59,8 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
5759
ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
5860

5961
# rclone installation
62+
ARG TARGETARCH
63+
ENV TARGETARCH=${TARGETARCH}
6064
RUN \
6165
--mount=type=bind,source=scripts/install_rclone.bash,target=/tmp/install_rclone.bash \
6266
./tmp/install_rclone.bash

services/dynamic-sidecar/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,19 @@ RUN \
5353
&& gosu nobody true
5454

5555
# install RClone, we do it in a separate layer such that the cache is not locked forever, as this seems to take a long time
56+
ARG TARGETARCH
57+
ENV TARGETARCH=${TARGETARCH}
5658
RUN \
5759
--mount=type=bind,source=scripts/install_rclone.bash,target=install_rclone.bash \
5860
./install_rclone.bash
5961

6062
RUN AWS_CLI_VERSION="2.11.11" \
61-
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" \
63+
&& case "${TARGETARCH}" in \
64+
"amd64") ARCH="x86_64" ;; \
65+
"arm64") ARCH="aarch64" ;; \
66+
*) echo "Unsupported architecture: ${TARGETARCH}" && exit 1 ;; \
67+
esac \
68+
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-${ARCH}-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" \
6269
&& apt-get update && apt-get install -y unzip \
6370
&& unzip awscliv2.zip \
6471
&& ./aws/install \

0 commit comments

Comments
 (0)