Skip to content

Commit

Permalink
[nim] fix arm install
Browse files Browse the repository at this point in the history
  • Loading branch information
shish committed Apr 6, 2024
1 parent 2a1334e commit bfbb623
Showing 1 changed file with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions utils/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GO_VERSION=1.21.1
ARG NIM_VERSION=2.0.0
ARG NIM_VERSION=2-0
ARG PHP_VERSION=8.2.10
ARG PYTHON_VERSION=3.11.5
ARG RUST_VERSION=1.72.0
Expand Down Expand Up @@ -44,9 +44,21 @@ ENV PATH="/home/dev/.go/bin:$PATH"
FROM base-builder AS nim-builder
ARG NIM_VERSION
USER dev
ENV CHOOSENIM_CHOOSE_VERSION=${NIM_VERSION}
ENV PATH="/home/dev/.nimble/bin:$PATH"
RUN curl https://nim-lang.org/choosenim/init.sh -sSf | sh -s -- -y && \
ENV PATH="/home/dev/.nim/bin:$PATH"
# choosenim doesn't work on arm64 D:
#ENV CHOOSENIM_CHOOSE_VERSION=${NIM_VERSION}
#RUN curl https://nim-lang.org/choosenim/init.sh -sSf | sh -s -- -y && \
# nimble refresh
RUN if [ "$(dpkg --print-architecture)" = "arm64" ] ; then \
NIM_ARCH=arm64 \
elif [ "$(dpkg --print-architecture)" = "amd64" ] ; then \
NIM_ARCH=x64 \
else \
echo "only x86_64 and arm64 are supported" \
&& exit 1 \
fi \
https://github.com/nim-lang/nightlies/releases/download/latest-version-${NIM_VERSION}/linux_${NIM_ARCH}.tar.xz -O /tmp/nim.tar.xz && \
mkdir ~/.nim && tar --strip-components=1 -C ~/.nim -xf /tmp/nim.tar.xz && rm -f /tmp/nim.tar.xz && \
nimble refresh


Expand Down Expand Up @@ -126,9 +138,8 @@ COPY --from=go-builder --chown=${USER_ID}:${GROUP_ID} /home/dev/.go /home/dev/.g
ENV PATH="/home/dev/.go/bin:$PATH"

# Install Nim tools
COPY --from=nim-builder --chown=${USER_ID}:${GROUP_ID} /home/dev/.choosenim /home/dev/.choosenim
COPY --from=nim-builder --chown=${USER_ID}:${GROUP_ID} /home/dev/.nimble /home/dev/.nimble
ENV PATH="/home/dev/.nimble/bin:$PATH"
COPY --from=nim-builder --chown=${USER_ID}:${GROUP_ID} /home/dev/.nim /home/dev/.nim
ENV PATH="/home/dev/.nim/bin:$PATH"

# Install PHP tools
COPY --from=php-builder --chown=${USER_ID}:${GROUP_ID} /home/dev/.php /home/dev/.php
Expand Down

0 comments on commit bfbb623

Please sign in to comment.