Docker: newer dev.x86_64.stable image with adv_plat installation fixed

storypku · storypku · commit 45a787ab94e9 · 2021-05-07T21:17:32.000+08:00
diff --git a/docker/build/build_docker.sh b/docker/build/build_docker.sh
@@ -138,7 +138,7 @@ function determine_prev_image_timestamp() {
             fi
         elif [[ "${stage}" == "runtime" ]]; then
             if [[ "${dist}" == "stable" ]]; then
-                result="20210426_0123"
+                result="20210428_1718"
             fi
         fi
     else # aarch64
diff --git a/docker/build/installers/install_adv_plat.sh b/docker/build/installers/install_adv_plat.sh
@@ -18,15 +18,16 @@
 # Fail on first error.
 set -e
 
-MY_MODE="${1:-build}"
+MY_MODE="${1:-download}"
 
 cd "$(dirname "${BASH_SOURCE[0]}")"
 . ./installer_base.sh
 
 ARCH="$(uname -m)"
 
 DEST_DIR="${PKGS_DIR}/adv_plat"
-[[ -d ${DEST_DIR} ]] || mkdir -p ${DEST_DIR}
+[[ -d ${DEST_DIR} ]] && rm -rf ${DEST_DIR}
+mkdir -p ${DEST_DIR}
 
 if [[ "${MY_MODE}" == "download" ]]; then
     if [[ "${ARCH}" == "x86_64" ]]; then
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-20210426_0123
+ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210428_1718
 
 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-20210426_0123
+ARG IMAGE_VERSION=18.04-20210428_1718
 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-20210426_0123
+IMAGE_VERSION=18.04-20210428_1718
 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-20210426_0123"
+VERSION_X86_64="dev-x86_64-18.04-20210428_1718"
 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-20210426_0123"
+VERSION_X86_64="dev-x86_64-18.04-20210428_1718"
 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-20210426_0123`
	`1`	`+ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210428_1718`
`2`	`2`
`3`	`3`	`ARG BASE_IMAGE=nvidia/cuda:11.1-runtime-ubuntu18.04`
`4`	`4`