diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full index 73bcb0a048..d4daf67182 100644 --- a/docker/Dockerfile.full +++ b/docker/Dockerfile.full @@ -60,24 +60,18 @@ RUN apt-get -y install \ # armv7l does not have wheels for any of these # 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 \ -# python3-matplotlib \ -# python3-numpy \ -# python3-opencv \ -# python3-pil \ -# python3-skimage; \ -# fi - -# for consistency jsut always install it... -RUN apt-get -y install \ +# which causes weird behavior in python which looks at the arch version +# which still reports 64bit, even if running in 32bit docker. +# this scenario is not supported and will be reported at runtime. +RUN if [ "$(uname -m)" = "armv7l" ]; \ + then \ + apt-get -y install \ python3-matplotlib \ python3-numpy \ python3-opencv \ python3-pil \ - python3-skimage + python3-skimage; \ + fi # python pip RUN python3 -m pip install --upgrade pip diff --git a/docker/template/Dockerfile.full.header b/docker/template/Dockerfile.full.header index 3202f56d79..19e252b9bd 100644 --- a/docker/template/Dockerfile.full.header +++ b/docker/template/Dockerfile.full.header @@ -59,23 +59,16 @@ RUN apt-get -y install \ # furthermore, it's possible to run 32bit docker on 64bit arm, # which causes weird behavior in python which looks at the arch version # which still reports 64bit, even if running in 32bit docker. -# 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 just always install it... -RUN apt-get -y install \ +# this scenario is not supported and will be reported at runtime. +RUN if [ "$(uname -m)" = "armv7l" ]; \ + then \ + apt-get -y install \ python3-matplotlib \ python3-numpy \ python3-opencv \ python3-pil \ - python3-skimage + python3-skimage; \ + fi # python pip RUN python3 -m pip install --upgrade pip