Skip to content

Commit 532895b

Browse files
authored
chore: determine the current architecture in build time (#49)
More podman and non-buildx friendly
1 parent 6222159 commit 532895b

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

builder/Dockerfile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG OS_CODENAME=jammy
22

3-
FROM ubuntu:${OS_CODENAME} AS base
3+
FROM ubuntu:${OS_CODENAME}
44

55
ARG DEBIAN_FRONTEND=noninteractive
66
ARG GCC_ARM_VERSION=14.2.rel1
@@ -38,21 +38,12 @@ RUN uv venv \
3838
# Add venv to PATH
3939
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
4040

41-
FROM base AS base-amd64
42-
ENV GCC_ARM_ARCH=x86_64
43-
44-
FROM base AS base-arm64
45-
ENV GCC_ARM_ARCH=aarch64
46-
47-
ARG TARGETARCH
48-
49-
FROM base-${TARGETARCH}
50-
5141
# Install ARM toolchain
52-
RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-${GCC_ARM_ARCH}-arm-none-eabi.tar.xz -O - \
53-
| tar -xJ -C /opt
42+
RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-$( uname -m )-arm-none-eabi.tar.xz -O - \
43+
| tar -xJ -C /opt \
44+
&& ln -s /opt/arm-gnu-toolchain-*-arm-none-eabi /opt/arm-gnu-toolchain-arm-none-eabi
5445

55-
ENV PATH=/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-${GCC_ARM_ARCH}-arm-none-eabi/bin/:${PATH}
46+
ENV PATH=/opt/arm-gnu-toolchain-arm-none-eabi/bin/:${PATH}
5647

5748
VOLUME ["/src"]
5849
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

0 commit comments

Comments
 (0)