Merge pull request #222 from intel/dockerfile-updates

Update Dockerfile

Author: LewisLiuPub

docker/ros2_2021.4/ros2_dashing/Dockerfile

@@ -2,6 +2,11 @@
 
 from amd64/ros:dashing
 
+# setting proxy env --option 
+# If needed, enable the below ENV setting by correct proxies.
+# ENV http_proxy=your_proxy
+# ENV https_proxy=your_proxy
+
 # maintainer information
 LABEL maintainer="Pengqiang Li <[email protected]>"
 
@@ -26,7 +31,9 @@ RUN source /opt/intel/openvino_2021/bin/setupvars.sh
 RUN apt-get install -y --no-install-recommends \
 software-properties-common 
 # https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md
-RUN apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+# Make sure you set http-proxy in below commands if your environment needs.
+# RUN apt-key adv --keyserver-options http-proxy=your_proxy --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=your_proxy --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+RUN apt-key adv --keyserver-options --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
 RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo bionic main" -u \
 && apt-get install -y --no-install-recommends \
 librealsense2-dkms \

docker/ros2_2021.4/ros2_foxy/Dockerfile

@@ -2,6 +2,11 @@
 
 from osrf/ros:foxy-desktop
 
+# setting proxy env --option 
+# If needed, enable the below ENV setting by correct proxies.
+# ENV http_proxy=your_proxy
+# ENV https_proxy=your_proxy
+
 # maintainer information
 LABEL maintainer="Pengqiang Li <[email protected]>"
 
@@ -22,7 +27,9 @@ RUN source /opt/intel/openvino_2021/bin/setupvars.sh
 RUN apt-get install -y --no-install-recommends \
 software-properties-common 
 # https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md
-RUN apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+# Make sure you set http-proxy in below commands if your environment needs.
+# RUN apt-key adv --keyserver-options http-proxy=your_proxy --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=your_proxy --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+RUN apt-key adv --keyserver-options --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
 RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo focal main" -u \
 && apt-get install -y --no-install-recommends \
 librealsense2-dkms \

docker/ros2_2021.4/ros2_galactic/Dockerfile

@@ -3,8 +3,9 @@
 from osrf/ros:galactic-desktop
 
 # setting proxy env --option 
-ENV http_proxy=http://child-prc.intel.com:913
-ENV https_proxy=http://child-prc.intel.com:913
+# If needed, enable the below ENV setting by correct proxies.
+# ENV http_proxy=your_proxy
+# ENV https_proxy=your_proxy
 
 # maintainer information
 LABEL maintainer="Pengqiang Li <[email protected]>"
@@ -26,7 +27,9 @@ RUN source /opt/intel/openvino_2021/bin/setupvars.sh
 RUN apt-get install -y --no-install-recommends \
 software-properties-common 
 # https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md
-RUN apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=http://child-prc.intel.com:913/ --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+# Make sure you set http-proxy in below commands if your environment needs.
+# RUN apt-key adv --keyserver-options http-proxy=your_proxy --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options http-proxy=your_proxy --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
+RUN apt-key adv --keyserver-options --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || apt-key adv --keyserver-options --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE 
 RUN add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo focal main" -u \
 && apt-get install -y --no-install-recommends \
 librealsense2-dkms \