docker: arm fixes

koush · Mar 25, 2023 · c6dc628 · c6dc628
1 parent f974653
commit c6dc628
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full
@@ -59,7 +59,9 @@ RUN apt-get -y install \
 
 # armv7l does not have wheels for any of these
 # and compile times would forever, if it works at all.
-RUN if [ "$(uname -m)" = "armv7l" ]; \
+# furthermore, it's possible to run 32bit docker on 64bit arm,
+# which causes all sorts of weird behavior.
+RUN if [ "$(uname -m)" = "armv7l" ] || [ "$(uname -m)" = "aarch64" ]; \
     then \
         apt-get -y install \
         python3-matplotlib \

diff --git a/docker/template/Dockerfile.full.header b/docker/template/Dockerfile.full.header
@@ -56,7 +56,9 @@ RUN apt-get -y install \
 
 # armv7l does not have wheels for any of these
 # and compile times would forever, if it works at all.
-RUN if [ "$(uname -m)" = "armv7l" ]; \
+# furthermore, it's possible to run 32bit docker on 64bit arm,
+# which causes all sorts of weird behavior.
+RUN if [ "$(uname -m)" = "armv7l" ] || [ "$(uname -m)" = "aarch64" ]; \
     then \
         apt-get -y install \
         python3-matplotlib \