michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-09-17 09:10:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: rollback linux changes

Browse Source
This commit is contained in:
Koushik Dutta
2023-03-25 18:35:40 -07:00
parent 3d5ccf25d1
commit 76bf1d0d3f
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docker/Dockerfile.full
View File

@@ -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
docker/template/Dockerfile.full.header
View File

@@ -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