Merge pull request #655 from mandulaj/fix/Docker16_18

Fix/docker16 18
ethz-asl · Jan 16, 2024 · 10ad876 · 10ad876
2 parents c4a1d89 + d5f10a1
commit 10ad876
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile_ros1_16_04 b/Dockerfile_ros1_16_04
@@ -11,9 +11,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
  libeigen3-dev libboost-all-dev libsuitesparse-dev \
  doxygen \
  libopencv-dev \
- libpoco-dev libtbb-dev libblas-dev liblapack-dev libv4l-dev \
- python-catkin-tools
+ libpoco-dev libtbb-dev libblas-dev liblapack-dev libv4l-dev
 
+# Install unauthenticated packages
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
+ apt-get install -y --allow-unauthenticated python-catkin-tools
 
 # Create the workspace and build kalibr in it
 ENV WORKSPACE /catkin_ws

diff --git a/Dockerfile_ros1_18_04 b/Dockerfile_ros1_18_04
@@ -1,5 +1,7 @@
 FROM osrf/ros:melodic-desktop-full
 
+# Add expired GPG key
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv 4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA
 
 # Dependencies we use, catkin tools is very good build system
 # https://github.com/ethz-asl/kalibr/wiki/installation
@@ -11,9 +13,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
  libeigen3-dev libboost-all-dev libsuitesparse-dev \
  doxygen \
  libopencv-dev \
- libpoco-dev libtbb-dev libblas-dev liblapack-dev libv4l-dev \
- python-catkin-tools
+ libpoco-dev libtbb-dev libblas-dev liblapack-dev libv4l-dev
 
+# Install unauthenticated packages
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
+ apt-get install -y --allow-unauthenticated python-catkin-tools
 
 # Create the workspace and build kalibr in it
 ENV WORKSPACE /catkin_ws