Skip to content

Commit

Permalink
docker: rollback linux changes
Browse files Browse the repository at this point in the history
  • Loading branch information
koush committed Mar 26, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 3d5ccf2 commit 76bf1d0
Showing 2 changed files with 14 additions and 27 deletions.
22 changes: 8 additions & 14 deletions docker/Dockerfile.full
Original file line number Diff line number Diff line change
@@ -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
19 changes: 6 additions & 13 deletions docker/template/Dockerfile.full.header
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 76bf1d0

Please sign in to comment.