Docker: updated dev.x86 Docker image w/ libpcap-dev for LiDAR drivers (ApolloAuto#13687)

storypku · web-flow · commit 47f9a95dac6b · 2021-04-15T20:47:09.000+08:00
Dockerfile:
==========
ROM apolloauto/apollo:dev-x86_64-18.04-20210315_2158
COPY installers/install_drivers_deps.sh /opt/apollo/installers/install_drivers_deps.sh
RUN  apt-get update &amp;&amp; apt-get -y install  --no-install-recommends libpcap-dev &amp;&amp; apt-get clean &amp;&amp; rm -rf /var/lib/apt/lists/*
diff --git a/docker/build/build_docker.sh b/docker/build/build_docker.sh
@@ -146,7 +146,7 @@ function determine_prev_image_timestamp() {
             fi
         elif [[ "${stage}" == "runtime" ]]; then
             if [[ "${dist}" == "stable" ]]; then
-                result="20210315_2158"
+                result="20210414_1711"
             fi
         fi
     else # aarch64
diff --git a/docker/build/installers/install_drivers_deps.sh b/docker/build/installers/install_drivers_deps.sh
@@ -27,11 +27,15 @@ bash ${CURR_DIR}/install_opencv.sh
 bash ${CURR_DIR}/install_adv_plat.sh "${MY_MODE}"
 bash ${CURR_DIR}/install_proj.sh
 
-# Required by python audio driver
+# Required by Python audio driver
 apt_get_update_and_install \
     python3-pyaudio \
     portaudio19-dev
 
+# Required by LiDAR drivers for packets captured via pcap
+apt_get_update_and_install \
+    libpcap-dev
+
 # Clean up cache to reduce layer size.
 apt-get clean && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/build/runtime.x86_64.dockerfile.sample b/docker/build/runtime.x86_64.dockerfile.sample
@@ -1,4 +1,4 @@
-ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210315_2158
+ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210414_1711
 
 ARG BASE_IMAGE=nvidia/cuda:11.1-runtime-ubuntu18.04
 
diff --git a/docker/build/standalone.x86_64.dockerfile b/docker/build/standalone.x86_64.dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REPO=apolloauto/apollo
 ARG TARGET_ARCH=x86_64
-ARG IMAGE_VERSION=18.04-20210315_2158
+ARG IMAGE_VERSION=18.04-20210414_1711
 ARG BASE_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION}
 
 ARG DOCKER_USER
diff --git a/docker/build/standalone.x86_64.sh b/docker/build/standalone.x86_64.sh
@@ -8,7 +8,7 @@ DOCKER_USER_ID=1001
 DOCKER_GRP=apollo
 DOCKER_GRP_ID=1001
 TARGET_ARCH=x86_64
-IMAGE_VERSION=18.04-20210315_2158
+IMAGE_VERSION=18.04-20210414_1711
 DEV_IMAGE=${DOCKER_REPO}:dev-${TARGET_ARCH}-${IMAGE_VERSION}
 RUNTIME_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION}
 STANDALONE_IMAGE=${DOCKER_REPO}:standalone-${TARGET_ARCH}-${IMAGE_VERSION}
diff --git a/docker/scripts/dev_start.sh b/docker/scripts/dev_start.sh
@@ -27,7 +27,7 @@ DEV_INSIDE="in-dev-docker"
 SUPPORTED_ARCHS=(x86_64 aarch64)
 TARGET_ARCH="$(uname -m)"
 
-VERSION_X86_64="dev-x86_64-18.04-20210315_2158"
+VERSION_X86_64="dev-x86_64-18.04-20210414_1711"
 TESTING_VERSION_X86_64="dev-x86_64-18.04-testing-20210112_0008"
 
 VERSION_AARCH64="dev-aarch64-18.04-20201218_0030"
diff --git a/docker/scripts/runtime_start.sh b/docker/scripts/runtime_start.sh
@@ -25,7 +25,7 @@ RUNTIME_STANDALONE="false"
 
 TARGET_ARCH="$(uname -m)"
 
-VERSION_X86_64="dev-x86_64-18.04-20210315_2158"
+VERSION_X86_64="dev-x86_64-18.04-20210414_1711"
 USER_VERSION_OPT=
 
 FAST_MODE="no"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210315_2158`
	`1`	`+ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210414_1711`
`2`	`2`
`3`	`3`	`ARG BASE_IMAGE=nvidia/cuda:11.1-runtime-ubuntu18.04`
`4`	`4`