Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: add arm64 support #465

Closed
wants to merge 1 commit into from
Closed

docker: add arm64 support #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/Dockerfile_bullseye
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ FROM debian:bullseye@sha256:71cb300d5448af821aedfe63afd55ba05f45a6a79f00dcd131b9
WORKDIR /root
COPY bullseye_deps.sh ./deps.sh
COPY requirements.txt ./contrib/requirements.txt
ARG TARGETARCH
ENV TARGETARCH=${TARGETARCH}
RUN ./deps.sh && rm ./deps.sh
ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
ENV ANDROID_NDK=/opt/android-ndk-r26b
14 changes: 11 additions & 3 deletions contrib/bullseye_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ fi
apt install --no-install-recommends unzip autoconf automake autotools-dev pkg-config build-essential libtool python3{,-dev,-pip,-virtualenv} python{,-dev}-is-python3 clang{,-format,-tidy} git swig curl cmake libssl-dev libtool-bin $java_packages curl $windows_packages valgrind jq -yqq

if [ -z "$skip_java" ]; then
update-java-alternatives -s java-1.11.0-openjdk-amd64
update-java-alternatives -s java-1.11.0-openjdk-${TARGETARCH}
export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-${TARGETARCH}
fi

pip3 install valgrind-codequality -r contrib/requirements.txt
Expand All @@ -58,8 +59,15 @@ if [ -z "$skip_emsdk" ]; then
# Install emsdk
git clone https://github.com/emscripten-core/emsdk
cd emsdk
./emsdk install 3.1.52
./emsdk activate 3.1.52
if [ "${TARGETARCH}" = "arm64" ]; then
# very few versions of emsdk are available for linux-arm64
# https://github.com/emscripten-core/emsdk/issues/547
./emsdk install 3.1.33
./emsdk activate 3.1.33
else
./emsdk install 3.1.52
./emsdk activate 3.1.52
fi
# Force emsdk to use the installed node version instead of its own
sed -i "s/^NODE_JS = .*$/NODE_JS = 'node'/g" /opt/emsdk/.emscripten
# Make emsdk commands available
Expand Down