x86 support

dusty-nv · Jun 3, 2022 · 54a01ec · 54a01ec
1 parent 246f554
commit 54a01ec
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ FROM ${BASE_IMAGE}
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SHELL /bin/bash
 
-WORKDIR jetson-inference
+WORKDIR /jetson-inference
 
 
 #

diff --git a/docker/push.sh b/docker/push.sh
@@ -14,4 +14,4 @@ push()
 	echo "done pushing image $CONTAINER_REMOTE_IMAGE"
 }
 
-push "jetson-inference:r$L4T_VERSION"
+push $TAG
diff --git a/docker/run.sh b/docker/run.sh
@@ -165,10 +165,28 @@ echo "V4L2_DEVICES:  $V4L2_DEVICES"
 # run the container
 sudo xhost +si:localuser:root
 
-sudo docker run --runtime nvidia -it --rm --security-opt  seccomp=unconfined --network host -e DISPLAY=$DISPLAY \
-    -v /tmp/.X11-unix/:/tmp/.X11-unix \
-    -v /tmp/argus_socket:/tmp/argus_socket \
-    -v /etc/enctune.conf:/etc/enctune.conf \
-    $V4L2_DEVICES $DATA_VOLUME $USER_VOLUME \
-    $CONTAINER_IMAGE $USER_COMMAND
+if [ $ARCH = "aarch64" ]; then
+
+	sudo docker run --runtime nvidia -it --rm \
+		--network host \
+		-e DISPLAY=$DISPLAY \
+		-v /tmp/.X11-unix/:/tmp/.X11-unix \
+		-v /tmp/argus_socket:/tmp/argus_socket \
+		-v /etc/enctune.conf:/etc/enctune.conf \
+		$V4L2_DEVICES $DATA_VOLUME $USER_VOLUME \
+		$CONTAINER_IMAGE $USER_COMMAND
+
+elif [ $ARCH = "x86_64" ]; then
+
+	sudo docker run --gpus all -it --rm \
+		--network=host \
+		--shm-size=8g \
+		--ulimit memlock=-1 \
+		--ulimit stack=67108864 \
+		-e DISPLAY=$DISPLAY \
+		-v /tmp/.X11-unix/:/tmp/.X11-unix \
+		$V4L2_DEVICES $DATA_VOLUME $USER_VOLUME \
+		$CONTAINER_IMAGE $USER_COMMAND
+
+fi
 
diff --git a/docker/tag.sh b/docker/tag.sh
@@ -49,6 +49,7 @@ if [ $ARCH = "aarch64" ]; then
 elif [ $ARCH = "x86_64" ]; then
 	# TODO:  add logic here for getting the latest release
 	CONTAINER_IMAGE="jetson-inference:22.06"
+	CONTAINER_REMOTE_IMAGE="dustynv/$CONTAINER_IMAGE"
 fi
 
 # TAG is always the local container name