X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=scripts%2Fdocker%2Fexec.bash;h=824405970abb10dc462a20db015de1cd430ea61f;hb=bc35c2b12391c30c86ab8b713f456c7d8a5d701d;hp=ec61e1b6e5f88a5f58782768d9ef44594d1d7fa4;hpb=78e56cf8a2029981502dd632a8fbc08da558fe01;p=blank.git

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index ec61e1b..8244059 100755
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -4,15 +4,21 @@
 # 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}"
+image_path="scripts/docker/${IMAGE//:/-}"
+
+xvfb_cmd="xvfb-run -a --server-args='-screen 0 1024x768x24 +extension RANDR +extension GLX'"
+
+build_cmd="git clone /repo /workdir && cd /workdir && make -j\$(nproc) $TARGETS"
+
+if [[ "$KEEP" != "" ]]; then
+	build_cmd="${build_cmd} && cp -Rv $KEEP /repo"
+fi
 
-build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
 
 local_conf=""
 
@@ -20,9 +26,5 @@ if [[ "$TARGETS" == *codecov* ]]; then
 	local_conf="$local_conf $(bash <(curl -s https://codecov.io/env))"
 fi
 
-if [ -e "${image_path}/env" ]; then
-	local_conf="$local_conf --env-file ${image_path}/env"
-fi
-
 docker build -t "${image_name}" --pull=true "${image_path}"
-docker run -v "$PWD":/repo ${local_conf} "${image_name}" /bin/bash -c "${build_cmd}"
+docker run -v "$PWD":/repo ${local_conf} "${image_name}" sh -c "$xvfb_cmd sh -c 'env ; glewinfo | head ; ${build_cmd}'"