Bladeren bron

use copy instead of link in docker

lyon 3 jaren geleden
bovenliggende
commit
3ce512a519
4 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 3 0
      docker/Dockerfile
  2. 1 1
      docker/build.sh
  3. 1 0
      port/linux/install_dependency.sh
  4. 1 1
      port/linux/valgrind.sh

+ 3 - 0
docker/Dockerfile

@@ -39,3 +39,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 RUN apt-get install -y python3
 RUN git config --global --add safe.directory /usr/src/pikascript
 
+RUN apt-get install -y valgrind
+
+COPY . /usr/src/pikascript

+ 1 - 1
docker/build.sh

@@ -2,4 +2,4 @@ DOCKER_NAME=pikadev
 
 docker rmi $DOCKER_NAME
 
-docker build -t $DOCKER_NAME .
+cd .. && docker build -t $DOCKER_NAME docker

+ 1 - 0
port/linux/install_dependency.sh

@@ -1,5 +1,6 @@
 sudo apt install cmake -y
 sudo apt install g++ -y
+sudo apt install valgrind -y
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 
 git clone https://github.com/google/benchmark.git google_benchmark && cd google_benchmark && cmake -E make_directory "build" && cmake -E chdir "build" cmake -DBENCHMARK_DOWNLOAD_DEPENDENCIES=on -DCMAKE_BUILD_TYPE=Release ../ && cmake --build "build" --config Release && sudo cmake --build "build" --config Release --target install

+ 1 - 1
port/linux/valgrind.sh

@@ -1,6 +1,6 @@
 sh only_make.sh
 if [ $# == 0 ] ; then
-	valgrind -s --track-origins=yes --leak-check=full --show-leak-kinds=all --exit-on-first-error=yes build/test/pikascript_test 
+	valgrind -s --track-origins=yes --leak-check=full --show-leak-kinds=all build/test/pikascript_test 
 fi
 
 if [ $# == 1 ] ; then