提交 bfc8515e 编写于 作者: S storypku 提交者: Liu Jiaming

Docker: make {base,cyber,dev}.x86_64.dockerfile work

1) remove arg BUILD_STAGE
2) introduce arg APOLLO_DIST as stable/testing
3) unified arg BASE_IMAGE
上级 37a623da
......@@ -2,6 +2,7 @@ ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG TENSORRT_VERSION
# ENV TENSORRT_VERSION ${TENSORRT_VERSION}
#For only running TensorRT C++ applications:
# sudo apt-get install libnvinfer7 libnvonnxparsers7 libnvparsers7 libnvinfer-plugin7
......
ARG BASE_IMAGE=apolloauto/apollo:L4T-cuda10.2-cudnn8-trt7-devl-18.04-20200928_1000
ARG BASE_IMAGE
# ARG BASE_IMAGE=arm64v8/ubuntu:18.04
FROM ${BASE_IMAGE}
ARG BUILD_STAGE
ARG GEOLOC
ARG INSTALL_MODE
......@@ -23,6 +22,6 @@ RUN bash /tmp/installers/install_cyber_deps.sh
RUN bash /tmp/installers/install_qa_tools.sh
RUN bash /tmp/installers/install_visualizer_deps.sh ${INSTALL_MODE}
RUN bash /tmp/installers/post_install.sh ${BUILD_STAGE}
RUN bash /tmp/installers/post_install.sh cyber
WORKDIR /apollo
ARG BASE_IMAGE=apolloauto/apollo:cuda10.2-cudnn7-trt7-devel-18.04-x86_64
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG BUILD_STAGE
ARG GEOLOC
LABEL version="1.2"
......@@ -22,6 +21,6 @@ RUN bash /tmp/installers/install_llvm_clang.sh
RUN bash /tmp/installers/install_qa_tools.sh
RUN bash /tmp/installers/install_visualizer_deps.sh
RUN bash /tmp/installers/install_bazel.sh
RUN bash /tmp/installers/post_install.sh ${BUILD_STAGE}
RUN bash /tmp/installers/post_install.sh cyber
WORKDIR /apollo
ARG BASE_IMAGE_GPU=apolloauto/apollo:cyber-aarch64-18.04-20200929_0922
FROM ${BASE_IMAGE_GPU}
ARG BASE_IMAGE
#=apolloauto/apollo:cyber-aarch64-18.04-20200929_0922
FROM ${BASE_IMAGE}
ARG GEOLOC
ARG BUILD_STAGE
ARG INSTALL_MODE
WORKDIR /apollo
......
FROM apolloauto/apollo:cyber-x86_64-18.04-20201029_0047
ARG BASE_IMAGE
FROM ${BASE_IMAGE}
ARG GEOLOC
ARG BUILD_STAGE
ARG INSTALL_MODE
WORKDIR /apollo
COPY archive /tmp/archive
COPY installers /tmp/installers
RUN bash /tmp/installers/install_geo_adjustment.sh ${GEOLOC}
......@@ -25,4 +22,4 @@ RUN bash /tmp/installers/install_3rdparty_pept_deps.sh ${INSTALL_MODE}
RUN bash /tmp/installers/install_release_deps.sh
RUN bash /tmp/installers/post_install.sh ${BUILD_STAGE}
RUN bash /tmp/installers/post_install.sh dev
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册