提交 f02eda58 编写于 作者: S storypku 提交者: tthhee

Docker: new dev.x86_64.stable image with OpenCV correctly built for msf_visualizer

上级 70ad8303
...@@ -138,7 +138,7 @@ function determine_prev_image_timestamp() { ...@@ -138,7 +138,7 @@ function determine_prev_image_timestamp() {
fi fi
elif [[ "${stage}" == "runtime" ]]; then elif [[ "${stage}" == "runtime" ]]; then
if [[ "${dist}" == "stable" ]]; then if [[ "${dist}" == "stable" ]]; then
result="20210414_1711" result="20210426_0123"
fi fi
fi fi
else # aarch64 else # aarch64
......
ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210414_1711 ARG DEV_IMAGE_IN=apolloauto/apollo:dev-x86_64-18.04-20210426_0123
ARG BASE_IMAGE=nvidia/cuda:11.1-runtime-ubuntu18.04 ARG BASE_IMAGE=nvidia/cuda:11.1-runtime-ubuntu18.04
......
ARG DOCKER_REPO=apolloauto/apollo ARG DOCKER_REPO=apolloauto/apollo
ARG TARGET_ARCH=x86_64 ARG TARGET_ARCH=x86_64
ARG IMAGE_VERSION=18.04-20210414_1711 ARG IMAGE_VERSION=18.04-20210426_0123
ARG BASE_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION} ARG BASE_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION}
ARG DOCKER_USER ARG DOCKER_USER
......
...@@ -8,7 +8,7 @@ DOCKER_USER_ID=1001 ...@@ -8,7 +8,7 @@ DOCKER_USER_ID=1001
DOCKER_GRP=apollo DOCKER_GRP=apollo
DOCKER_GRP_ID=1001 DOCKER_GRP_ID=1001
TARGET_ARCH=x86_64 TARGET_ARCH=x86_64
IMAGE_VERSION=18.04-20210414_1711 IMAGE_VERSION=18.04-20210426_0123
DEV_IMAGE=${DOCKER_REPO}:dev-${TARGET_ARCH}-${IMAGE_VERSION} DEV_IMAGE=${DOCKER_REPO}:dev-${TARGET_ARCH}-${IMAGE_VERSION}
RUNTIME_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION} RUNTIME_IMAGE=${DOCKER_REPO}:runtime-${TARGET_ARCH}-${IMAGE_VERSION}
STANDALONE_IMAGE=${DOCKER_REPO}:standalone-${TARGET_ARCH}-${IMAGE_VERSION} STANDALONE_IMAGE=${DOCKER_REPO}:standalone-${TARGET_ARCH}-${IMAGE_VERSION}
......
...@@ -27,7 +27,7 @@ DEV_INSIDE="in-dev-docker" ...@@ -27,7 +27,7 @@ DEV_INSIDE="in-dev-docker"
SUPPORTED_ARCHS=(x86_64 aarch64) SUPPORTED_ARCHS=(x86_64 aarch64)
TARGET_ARCH="$(uname -m)" TARGET_ARCH="$(uname -m)"
VERSION_X86_64="dev-x86_64-18.04-20210414_1711" VERSION_X86_64="dev-x86_64-18.04-20210426_0123"
TESTING_VERSION_X86_64="dev-x86_64-18.04-testing-20210112_0008" TESTING_VERSION_X86_64="dev-x86_64-18.04-testing-20210112_0008"
VERSION_AARCH64="dev-aarch64-18.04-20201218_0030" VERSION_AARCH64="dev-aarch64-18.04-20201218_0030"
......
...@@ -25,7 +25,7 @@ RUNTIME_STANDALONE="false" ...@@ -25,7 +25,7 @@ RUNTIME_STANDALONE="false"
TARGET_ARCH="$(uname -m)" TARGET_ARCH="$(uname -m)"
VERSION_X86_64="dev-x86_64-18.04-20210414_1711" VERSION_X86_64="dev-x86_64-18.04-20210426_0123"
USER_VERSION_OPT= USER_VERSION_OPT=
FAST_MODE="no" FAST_MODE="no"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册