diff --git a/docker/Dockerfile b/docker/Dockerfile index 3bf9fbaf..5bc82bbe 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,15 +21,12 @@ ARG DEBIAN_FRONTEND=noninteractive ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 RUN apt-get update && apt-get install --assume-yes apt-utils -# install openvino 2022.1 -# https://docs.openvino.ai/2022.1/openvino_docs_install_guides_installing_openvino_apt.html -RUN apt update && apt install --assume-yes curl gnupg2 lsb-release -RUN curl -s https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB |apt-key add - -RUN echo "deb https://apt.repos.intel.com/openvino/2022 $(lsb_release -cs) main" |tee /etc/apt/sources.list.d/intel-openvino-2022.list -RUN apt update && apt-cache search openvino-2022.1.0 -RUN apt install --assume-yes openvino-2022.1.0 -RUN ls -lh /opt/intel/openvino_2022 -RUN source /opt/intel/openvino_2022/setupvars.sh +# install openvino 2022.3 +# https://docs.openvino.ai/2022.3/openvino_docs_install_guides_installing_openvino_apt.html +RUN apt update && apt install --assume-yes curl wget gnupg2 lsb-release +RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && \ +apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && echo "deb https://apt.repos.intel.com/openvino/2022 focal main" | tee /etc/apt/sources.list.d/intel-openvino-2022.list +RUN apt update && apt-cache search openvino && apt install -y openvino-2022.3.0 # install librealsense2 RUN apt-get install -y --no-install-recommends \ @@ -67,5 +64,5 @@ RUN git init && git clone https://github.com/intel/ros2_object_msgs.git \ && git clone -b ros2 https://github.com/intel/ros2_openvino_toolkit.git RUN apt-get install ros-${VERSION}-diagnostic-updater WORKDIR /root/catkin_ws -RUN source /opt/ros/${VERSION}/setup.bash && source /opt/intel/openvino_2022/setupvars.sh && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release +RUN source /opt/ros/${VERSION}/setup.bash && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release diff --git a/docker/docker_instructions_ov2.0.md b/docker/docker_instructions_ov2.0.md index 444d8519..c9cdd202 100644 --- a/docker/docker_instructions_ov2.0.md +++ b/docker/docker_instructions_ov2.0.md @@ -12,26 +12,26 @@ Refer to: [Docker_install_guide](https://docs.docker.com/engine/install/ubuntu/) ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_PRE_INSTALLED_PKG= --build-arg VERSION= --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG= --build-arg VERSION= --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_openvino_202203 . ``` For example: * Build image for ros_galactic ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_galactic_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_galactic_openvino_202203 . ``` * Build image for ros_foxy ``` cd ~/ros2_openvino_toolkit/docker/Dockerfile vi ~/ros2_openvino_toolkit/docker/Dockerfile -docker build --build-arg ROS_PRE_INSTALLED_PKG=foxy-desktop --build-arg VERSION=foxy --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_foxy_openvino_202201 . +docker build --build-arg ROS_PRE_INSTALLED_PKG=foxy-desktop --build-arg VERSION=foxy --build-arg "HTTP_PROXY=set_your_proxy" -t ros2_foxy_openvino_202203 . ``` ## 3. Download and load docker image * Download docker image ``` - # ros2_openvino_202201 for demo + # ros2_openvino_202203 for demo cd ~/Downloads/ wget ``` @@ -58,7 +58,6 @@ docker images * Preparation ``` -source /opt/intel/openvino_2022/setupvars.sh source /opt/ros//setup.bash cd ~/catkin_ws source ./install/local_setup.bash