different docker exec approach

[blank.git] / scripts / docker / exec.bash

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index faabff467b259a617162922154a933385ae6f879..824405970abb10dc462a20db015de1cd430ea61f 100755 (executable)
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -4,30 +4,27 @@
 # environment varables:
 #   IMAGE:    name of the docker image to use
 #   TARGETS:  targets to pass to `make` inside the container
-#   PASS_ENV: names of environment variables to import into
-#             the container during build
+#   KEEP:     file names to copy back out after all TARGETS have run
 
 IMAGE="${IMAGE:-archlinux-build}"
 
 image_name="localhorsttv/${IMAGE}"
 image_path="scripts/docker/${IMAGE//:/-}"
 
-build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
+xvfb_cmd="xvfb-run -a --server-args='-screen 0 1024x768x24 +extension RANDR +extension GLX'"
 
-local_conf=""
+build_cmd="git clone /repo /workdir && cd /workdir && make -j\$(nproc) $TARGETS"
 
-if [[ "$TARGETS" == *codecov* ]]; then
-       local_conf="$local_conf $(bash <(curl -s https://codecov.io/env))"
+if [[ "$KEEP" != "" ]]; then
+       build_cmd="${build_cmd} && cp -Rv $KEEP /repo"
 fi
 
-if [ -e "${image_path}/env" ]; then
-       local_conf="$local_conf --env-file ${image_path}/env"
-fi
 
-# copy XDG_RUNTIME_DIR if set
-if [ "$XDG_RUNTIME_DIR" != "" ]; then
-       local_conf="$local_conf -e XDG_RUNTIME_DIR='$XDG_RUNTIME_DIR'"
+local_conf=""
+
+if [[ "$TARGETS" == *codecov* ]]; then
+       local_conf="$local_conf $(bash <(curl -s https://codecov.io/env))"
 fi
 
 docker build -t "${image_name}" --pull=true "${image_path}"
-docker run -v "$PWD":/repo ${local_conf} "${image_name}" xvfb-run --server-args="-screen 0 1024x768x24" bash -c "env ; glewinfo | head ; ${build_cmd}"
+docker run -v "$PWD":/repo ${local_conf} "${image_name}" sh -c "$xvfb_cmd sh -c 'env ; glewinfo | head ; ${build_cmd}'"