docker: arm fixes

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

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full
@@ -61,15 +61,23 @@ RUN apt-get -y install \
 # and compile times would forever, if it works at all.
 # 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 \
+# RUN if [ "$(uname -m)" = "armv7l" ] || [ "$(uname -m)" = "aarch64" ]; \
+#     then \
+#         apt-get -y install \
+#         python3-matplotlib \
+#         python3-numpy \
+#         python3-opencv \
+#         python3-pil \
+#         python3-skimage; \
+#     fi
+
+# for consistency jsut always install it...
+RUN apt-get -y install \
         python3-matplotlib \
         python3-numpy \
         python3-opencv \
         python3-pil \
-        python3-skimage; \
-    fi
+        python3-skimage
 
 # python pip
 RUN python3 -m pip install --upgrade pip

diff --git a/docker/template/Dockerfile.full.header b/docker/template/Dockerfile.full.header
@@ -58,15 +58,23 @@ RUN apt-get -y install \
 # and compile times would forever, if it works at all.
 # 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 \
+# RUN if [ "$(uname -m)" = "armv7l" ] || [ "$(uname -m)" = "aarch64" ]; \
+#     then \
+#         apt-get -y install \
+#         python3-matplotlib \
+#         python3-numpy \
+#         python3-opencv \
+#         python3-pil \
+#         python3-skimage; \
+#     fi
+
+# for consistency jsut always install it...
+RUN apt-get -y install \
         python3-matplotlib \
         python3-numpy \
         python3-opencv \
         python3-pil \
-        python3-skimage; \
-    fi
+        python3-skimage
 
 # python pip
 RUN python3 -m pip install --upgrade pip