Updated start and stop scripts for Linux

Author: AlexanderSchultheiss

Dockerfile

@@ -16,8 +16,6 @@ RUN apt-get install -y --no-install-recommends build-essential libelf-dev libssl
 # Setup working directory
 WORKDIR /resources
 COPY ./docker-resources/ubuntu-repos.txt .
-# COPY ./docker-resources/maven-setup.sh /etc/profile.d/maven.sh
-# RUN chmod +x /etc/profile.d/maven.sh
 
 # Install jdk-8 and gcc-4.4
 RUN apt-get remove -y openjdk-*

build-docker-image.bat

@@ -1,4 +1,2 @@
-docker build -t variability-extraction^
-  --build-arg USER_ID="1000"^
-  --build-arg GROUP_ID="1000" .
+docker build -t variability-extraction .
 @pause

build-docker-image.sh

@@ -1,4 +1,2 @@
 #! /bin/bash
-docker build -t variability-extraction \
-  --build-arg USER_ID="$(id -u)" \
-  --build-arg GROUP_ID="$(id -g)" .
+docker build -t variability-extraction .

start-extraction.sh

@@ -1,42 +1,12 @@
 #! /bin/bash
 if [ "$1" = 'busybox' ]
 then
-    rm -rf extraction-results/busybox
-    docker run \
-    --user "$(id -u):$(id -g)" \
-    --name variability-extraction-busybox \
-    --mount source=busybox-extraction,target=/home/user/extraction-results/output \
-    variability-extraction "$@"
-
-    echo "Copying data from the Docker container to ./extraction-results/busybox"
     mkdir -p extraction-results/busybox
-    docker run --rm --volumes-from variability-extraction-busybox \
-    -u "$(id -u):$(id -g)" \
-    -v "$(pwd)/extraction-results/busybox":"/home/user/data" \
-    ubuntu cp -rf /home/user/extraction-results/output /home/user/data || exit
-
-    echo "Removing Docker container and volume"
-    docker container rm variability-extraction-busybox
-    docker volume rm busybox-extraction
+    docker run --rm -v "%cd%/extraction-results/busybox":"/home/user/extraction-results/output" variability-extraction "$@"
 elif [ "$1" = 'linux' ]
 then
-    rm -rf extraction-results/linux
-    docker run \
-    --user "$(id -u):$(id -g)" \
-    --name variability-extraction-linux \
-    --mount source=linux-extraction,target=/home/user/extraction-results/output \
-    variability-extraction "$@"
-
-    echo "Copying data from the Docker container to ./extraction-results/linux"
     mkdir -p extraction-results/linux
-    docker run --rm --volumes-from variability-extraction-linux \
-    -u "$(id -u):$(id -g)" \
-    -v "$(pwd)/extraction-results/linux":"/home/user/data" \
-    ubuntu cp -rf /home/user/extraction-results/output /home/user/data || exit
-
-    echo "Removing Docker container and volume"
-    docker container rm variability-extraction-linux
-    docker volume rm linux-extraction
+    docker run --rm -v "%cd%/extraction-results/linux":"/home/user/extraction-results/output" variability-extraction "$@"
 else
     echo "Select a SPL to extract [ ./start-extraction.sh linux | ./start-extraction.sh busybox ]"
 fi

stop-extraction.sh

@@ -1,12 +1,4 @@
-#!/bin/bash
-if [ "$1" = 'busybox' ]
-then
-    echo "Stopping busybox extraction"
-    docker container stop variability-extraction-busybox
-elif [ "$1" = 'linux' ]
-then
-    echo "Stopping linux extraction"
-    docker container stop variability-extraction-linux
-else
-    echo "Select a SPL to extract [ ./stop-extraction.sh linux | ./stop-extraction.sh busybox ]"
-fi
+#! /bin/bash
+echo "Stopping all running extractions. This will take a moment..."
+docker stop $(docker ps -a -q --filter "ancestor=variability-extraction")
+echo "...done."