Skip to content

Commit

Permalink
updated container build
Browse files Browse the repository at this point in the history
  • Loading branch information
dusty-nv committed Mar 7, 2023
1 parent 54c272b commit 1cae606
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ RUN cd /tmp && ./opencv_install.sh ${OPENCV_URL} ${OPENCV_DEB}
# copy source
#
COPY c c
COPY calibration calibration
COPY examples examples
COPY plugins plugins
COPY python python
COPY tools tools
COPY utils utils
Expand All @@ -102,13 +100,16 @@ RUN mkdir docs && \
touch docs/CMakeLists.txt && \
sed -i 's/nvcaffe_parser/nvparsers/g' CMakeLists.txt && \
cp -r /usr/local/include/gstreamer-1.0/gst/webrtc /usr/include/gstreamer-1.0/gst && \
ln -s /usr/lib/aarch64-linux-gnu/libgstwebrtc-1.0.so.0 /usr/lib/aarch64-linux-gnu/libgstwebrtc-1.0.so && \
ln -s /usr/lib/$(uname -m)-linux-gnu/libgstwebrtc-1.0.so.0 /usr/lib/$(uname -m)-linux-gnu/libgstwebrtc-1.0.so && \
mkdir build && \
cd build && \
cmake ../ && \
make -j$(nproc) && \
make install && \
/bin/bash -O extglob -c "cd /jetson-inference/build; rm -rf -v !(aarch64|download-models.*)" && \
/bin/bash -O extglob -c "cd /jetson-inference/build; rm -rf -v !($(uname -m)|download-models.*)" && \
rm -rf /var/lib/apt/lists/* \
&& apt-get clean


# workaround for "cannot allocate memory in static TLS block"
ENV LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libgomp.so.1
4 changes: 3 additions & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ source docker/tag.sh

if [ -z $BASE_IMAGE ]; then
if [ $ARCH = "aarch64" ]; then
if [ $L4T_VERSION = "35.1.0" ]; then
if [ $L4T_VERSION = "35.2.1" ]; then
BASE_IMAGE="nvcr.io/nvidia/l4t-pytorch:r35.2.1-pth2.0-py3"
elif [ $L4T_VERSION = "35.1.0" ]; then
BASE_IMAGE="nvcr.io/nvidia/l4t-pytorch:r35.1.0-pth1.12-py3"
elif [ $L4T_VERSION = "34.1.1" ]; then
BASE_IMAGE="nvcr.io/nvidia/l4t-pytorch:r34.1.1-pth1.12-py3"
Expand Down

0 comments on commit 1cae606

Please sign in to comment.