From ed09778ed7796ecd935bb3e4585a197a63ac0b65 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Thu, 29 Feb 2024 01:04:03 +0300 Subject: [PATCH] Save original bashrc --- docker/Dockerfile_base | 20 +++++-- docker/building_dependencies/runtime_env.sh | 66 ++++++++++----------- 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/docker/Dockerfile_base b/docker/Dockerfile_base index 19e434420..120832432 100644 --- a/docker/Dockerfile_base +++ b/docker/Dockerfile_base @@ -206,10 +206,22 @@ RUN wget https://github.com/CLIUtils/CLI11/releases/download/v1.9.1/CLI11.hpp -P RUN wget https://github.com/agauniyal/rang/releases/download/v3.1.0/rang.hpp -P $UTBOT_ALL/cli # Applying environment variables to all users -COPY building_dependencies/runtime_env.sh /tmp -RUN cat /tmp/runtime_env.sh >> /home/utbot/.bashrc -RUN cat /tmp/runtime_env.sh >> /root/.bashrc -RUN rm /tmp/runtime_env.sh +RUN mv /home/utbot/.bashrc /home/utbot/.bashrc_original +RUN mv /root/.bashrc /root/.bashrc_original +COPY building_dependencies/runtime_env.sh /home/utbot/.bashrc +COPY building_dependencies/runtime_env.sh /root/.bashrc +RUN cat /home/utbot/.bashrc_original >> /home/utbot/.bashrc +RUN cat /root/.bashrc_original >> /root/.bashrc + +RUN cat /root/.bashrc +RUN env + +# COPY building_dependencies/runtime_env.sh /tmp/runtime_env.sh +# RUN rm /tmp/runtime_env.sh +# RUN mv /home/utbot/.bashrc /home/utbot/.bashrc_copy +# RUN mv /root/.bashrc /root/.bashrc_copy +# COPY building_dependencies/runtime_env.sh /home/utbot/.bashrc +# COPY building_dependencies/runtime_env.sh /root/.bashrc # We need to install version 32 and 64 for klee. # Install uclibc-32 diff --git a/docker/building_dependencies/runtime_env.sh b/docker/building_dependencies/runtime_env.sh index 449aa3a51..f1a87f354 100644 --- a/docker/building_dependencies/runtime_env.sh +++ b/docker/building_dependencies/runtime_env.sh @@ -1,43 +1,43 @@ # This script is used to set environment variables inside developer environment # Common env -export UTBOT_ALL=/utbot_distr -export UTBOT_INSTALL_DIR=$UTBOT_ALL/install -export UTBOT_CMAKE_BINARY=$UTBOT_INSTALL_DIR/bin/cmake -export C_INCLUDE_PATH=$UTBOT_ALL/gtest/googletest/include -export LLVM_INCLUDE_DIRS=$UTBOT_ALL/llvm/llvm -export CMAKE_CXX_STANDARD=17 -export CMAKE_CXX_STANDARD_REQUIRED=ON -export GRPC_PATH=$UTBOT_INSTALL_DIR -export CLI_PATH=$UTBOT_ALL/cli -export NODE_TLS_REJECT_UNAUTHORIZED=0 +UTBOT_ALL=/utbot_distr +UTBOT_INSTALL_DIR=$UTBOT_ALL/install +UTBOT_CMAKE_BINARY=$UTBOT_INSTALL_DIR/bin/cmake +C_INCLUDE_PATH=$UTBOT_ALL/gtest/googletest/include +LLVM_INCLUDE_DIRS=$UTBOT_ALL/llvm/llvm +CMAKE_CXX_STANDARD=17 +CMAKE_CXX_STANDARD_REQUIRED=ON +GRPC_PATH=$UTBOT_INSTALL_DIR +CLI_PATH=$UTBOT_ALL/cli +NODE_TLS_REJECT_UNAUTHORIZED=0 # KLEE env -export COVERAGE=0 -export USE_TCMALLOC=1 -export LLVM_VERSION=14.0 -export ENABLE_OPTIMIZED=1 -export ENABLE_DEBUG=1 -export DISABLE_ASSERTIONS=0 -export REQUIRES_RTTI=0 -export SOLVERS=Z3 -export GTEST_VERSION=1.10.0 -export TCMALLOC_VERSION=2.7 -export SANITIZER_BUILD= -export MINISAT_VERSION=master -export USE_LIBCXX=1 -export KLEE_RUNTIME_BUILD="Debug+Asserts" +COVERAGE=0 +USE_TCMALLOC=1 +LLVM_VERSION=14.0 +ENABLE_OPTIMIZED=1 +ENABLE_DEBUG=1 +DISABLE_ASSERTIONS=0 +REQUIRES_RTTI=0 +SOLVERS=Z3 +GTEST_VERSION=1.10.0 +TCMALLOC_VERSION=2.7 +SANITIZER_BUILD= +MINISAT_VERSION=master +USE_LIBCXX=1 +KLEE_RUNTIME_BUILD="Debug+Asserts" -export CC=$UTBOT_INSTALL_DIR/bin/clang -export CXX=$UTBOT_INSTALL_DIR/bin/clang++ -export CPATH=$CPATH:$UTBOT_ALL/klee/include -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UTBOT_INSTALL_DIR/lib -export LDFLAGS=$LDFLAGS:'-fuse-ld=gold' -export CFLAGS="$CFLAGS -gdwarf-4" -export CXXFLAGS="$CXXFLAGS -gdwarf-4" -export PATH=$UTBOT_ALL/bear/bin:$UTBOT_ALL/klee/bin:$UTBOT_INSTALL_DIR/bin:$PATH +CC=$UTBOT_INSTALL_DIR/bin/clang +CXX=$UTBOT_INSTALL_DIR/bin/clang++ +CPATH=$CPATH:$UTBOT_ALL/klee/include +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UTBOT_INSTALL_DIR/lib +LDFLAGS=$LDFLAGS:'-fuse-ld=gold' +CFLAGS="$CFLAGS -gdwarf-4" +CXXFLAGS="$CXXFLAGS -gdwarf-4" +PATH=$UTBOT_ALL/bear/bin:$UTBOT_ALL/klee/bin:$UTBOT_INSTALL_DIR/bin:$PATH if [ -z "${VERSION}" ] then - export VERSION=$(date '+%Y.%-m').0 + VERSION=$(date '+%Y.%-m').0 fi