Merge pull request #454 from vobst/improve-docker-image-artificial_sa…

…mples Improve Docker image used for compiling artificial samples
fkie-cad · Apr 3, 2024 · 7297cd5 · 7297cd5
2 parents d69cca6 + f64ad83
commit 7297cd5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/test/artificial_samples/.dockerignore b/test/artificial_samples/.dockerignore
@@ -0,0 +1,2 @@
+build/*.out
+build/*.o
diff --git a/test/artificial_samples/Dockerfile b/test/artificial_samples/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get -y update \
  && echo "cwe:cwe" | chpasswd \
  && adduser cwe sudo \
  && sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
- 
+
 USER cwe
 
 RUN sudo apt-get install python3-pip apt-utils -y
@@ -17,8 +17,10 @@ RUN sudo pip3 install scons
 
 ENV PATH="/home/cwe/.local/bin/:${PATH}"
 
-COPY . /home/cwe/artificial_samples/
+COPY --chown=cwe:cwe ./install_cross_compilers.sh .
 
-WORKDIR /home/cwe/artificial_samples/
+RUN ./install_cross_compilers.sh
 
-RUN ./install_cross_compilers.sh
+COPY --chown=cwe:cwe . /home/cwe/artificial_samples/
+
+WORKDIR /home/cwe/artificial_samples/
diff --git a/test/artificial_samples/install_cross_compilers.sh b/test/artificial_samples/install_cross_compilers.sh
@@ -33,4 +33,7 @@ sudo apt install -y clang
 
 sudo ln -s /usr/include/asm-generic /usr/include/asm
 
+echo "Cleaning package index."
+sudo apt-get clean && sudo rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
+
 echo "Done."