Skip to content

Commit b44d0a1

Browse files
committed
change base image to ubuntu 20.04
1 parent b1054b1 commit b44d0a1

1 file changed

Lines changed: 37 additions & 21 deletions

File tree

src/yolov7_reid/src/Dockerfile

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG UBUNTU_BASE_IMG=ubuntu:18.04
1+
ARG UBUNTU_BASE_IMG=ubuntu:20.04
22
FROM $UBUNTU_BASE_IMG
33

44
ENV DEBIAN_FRONTEND "noninteractive"
@@ -39,16 +39,42 @@ ENV NO_CUDA=1
3939
ENV PATH=/root/miniconda/bin:$PATH
4040
RUN sudo apt-get install -y ffmpeg libsm6 libxext6
4141
ARG TARGETPLATFORM
42-
RUN case ${TARGETPLATFORM} in \
43-
"linux/arm64") MINICONDA_ARCH=aarch64 ;; \
44-
*) MINICONDA_ARCH=x86_64 ;; \
45-
esac && \
46-
curl -fsSL -v -o ~/miniconda.sh -O "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-${MINICONDA_ARCH}.sh" \
47-
&& chmod +x ~/miniconda.sh \
48-
&& ~/miniconda.sh -b -p ~/miniconda \
49-
&& rm ~/miniconda.sh \
50-
&& conda install -y python libopencv opencv py-opencv
51-
42+
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; \
43+
then \
44+
apt-get install -y build-essential cmake pkg-config libjpeg-dev libtiff5-dev \
45+
libpng-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev \
46+
libfontconfig1-dev libcairo2-dev libgdk-pixbuf2.0-dev libpango1.0-dev libgtk2.0-dev libgtk-3-dev \
47+
libatlas-base-dev gfortran libhdf5-dev libhdf5-serial-dev python3-pyqt5 python3-dev \
48+
&& pip3 install pip --upgrade ; \
49+
else \
50+
curl -fsSL -v -o ~/miniconda.sh -O "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh" \
51+
&& chmod +x ~/miniconda.sh \
52+
&& ~/miniconda.sh -b -p ~/miniconda \
53+
&& rm ~/miniconda.sh \
54+
&& conda install -y python libopencv opencv py-opencv \
55+
&& pip3 install pip --upgrade \
56+
&& pip3 install onnxruntime \
57+
python-telegram-bot==13.14 \
58+
notebook==6.4.12 \
59+
pymilvus==2.0.0 \
60+
youtube-dl==2020.12.2 \
61+
Flask==2.0.3 \
62+
redis==4.3.4 \
63+
pafy==0.5.5 ; \
64+
fi
65+
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; \
66+
then \
67+
pip3 install opencv-python==4.5.3.56 numpy==1.19.4 \
68+
onnxruntime \
69+
python-telegram-bot==13.14 \
70+
notebook==6.4.10 \
71+
pymilvus==2.0.0 \
72+
youtube-dl==2020.12.2 \
73+
Flask==2.0.3 \
74+
redis==4.3.4 \
75+
requests \
76+
pafy==0.5.5 ; \
77+
fi
5278
ENV LANG=en_US.UTF-8 \
5379
LANGUAGE=en_US.UTF-8 \
5480
LC_ALL=C.UTF-8 \
@@ -57,17 +83,7 @@ ENV LANG=en_US.UTF-8 \
5783
DISPLAY_HEIGHT=768 \
5884
RUN_XTERM=yes \
5985
RUN_FLUXBOX=yes
60-
ARG JETPACK_VERSION
6186

62-
RUN pip3 install --upgrade pip
63-
RUN pip3 install onnxruntime \
64-
python-telegram-bot==13.14 \
65-
notebook==6.4.12 \
66-
pymilvus==2.0.0 \
67-
youtube-dl==2020.12.2 \
68-
Flask==2.0.3 \
69-
redis==4.3.4 \
70-
pafy==0.5.5
7187
WORKDIR /root
7288

7389
ADD ./docker-novnc /app/docker-novnc

0 commit comments

Comments
 (0)