提交 ace1e644 编写于 作者: S storypku

Docker: user account settings

上级 3912e46a
......@@ -20,8 +20,6 @@ RUN bash /tmp/installers/install_qa_tools.sh
RUN bash /tmp/installers/install_cyber_deps.sh
RUN bash /tmp/installers/install_visualizer_deps.sh
RUN bash /tmp/installers/install_bazel.sh
RUN bash /tmp/installers/install_user.sh
RUN bash /tmp/installers/post_install.sh ${BUILD_STAGE}
WORKDIR /apollo
USER apollo
......@@ -76,10 +76,8 @@ RUN bash /tmp/installers/install_python_modules.sh
RUN bash /tmp/installers/install_qp_oases.sh
RUN bash /tmp/installers/install_qt.sh
RUN bash /tmp/installers/install_undistort.sh
RUN bash /tmp/installers/install_user.sh
RUN bash /tmp/installers/install_yarn.sh
RUN bash /tmp/installers/post_install.sh
RUN bash /tmp/installers/install_opuslib.sh
WORKDIR /apollo
USER apollo
......@@ -43,7 +43,7 @@ apt-get -y update && \
build-essential \
autotools-dev \
apt-file \
bc \
sudo \
gcc-7 \
g++-7 \
gdb \
......@@ -65,6 +65,12 @@ apt-get -y update && \
unzip \
zip
##----------------##
## SUDO ##
##----------------##
sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g'
##
##----------------##
## Python Setings |
##----------------##
......
......@@ -49,14 +49,10 @@ if [ "$BUILD" == "build" ] || [ "$ARCH" == "x86_64" ]; then
tar xzvf ${PKG_NAME}
pushd pcl-pcl-${VERSION}/
echo "add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)" > temp
cat CMakeLists.txt >> temp
mv temp CMakeLists.txt
mkdir build
cd build
cmake ..
make -j${THREAD_NUM}
make install
mkdir build && cd build
cmake ..
make -j${THREAD_NUM}
make install
popd
#clean up
......
#!/usr/bin/env bash
###############################################################################
# Copyright 2018 The Apollo Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
# Fail on first error.
set -e
apt-get -y update && \
apt-get -y install \
sudo && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
USER_NAME=apollo
adduser --disabled-password --gecos '' ${USER_NAME}
usermod -aG sudo ${USER_NAME}
sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g'
cp -f /etc/misc/user.bash_aliases /home/${USER_NAME}/.bash_aliases
cp -f /etc/misc/user.vimrc /home/${USER_NAME}/.vimrc
chown -R ${USER_NAME}:${USER_NAME} /home/${USER_NAME}
......@@ -5,7 +5,6 @@ ARG BUILD_STAGE
ARG INSTALL_MODE
WORKDIR /apollo
USER root
COPY installers /tmp/installers
RUN bash /tmp/installers/install_geo_adjustment.sh ${GEOLOC}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册