X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=scripts%2Fdocker%2Fexec.bash;h=faabff467b259a617162922154a933385ae6f879;hb=5c44bcd4519e992219908316d453dac7dfef2d47;hp=b146e7647e712ac85e767f08502776a8736614b1;hpb=bc3c21bd6557f787f9aa1782e67235ba5a8f3ec3;p=blank.git

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index b146e76..faabff4 100755
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -9,9 +9,25 @@
 
 IMAGE="${IMAGE:-archlinux-build}"
 
+image_name="localhorsttv/${IMAGE}"
+image_path="scripts/docker/${IMAGE//:/-}"
+
+build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
+
+local_conf=""
+
 if [[ "$TARGETS" == *codecov* ]]; then
-	ci_env=`bash <(curl -s https://codecov.io/env)`
+	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
+
+# copy XDG_RUNTIME_DIR if set
+if [ "$XDG_RUNTIME_DIR" != "" ]; then
+	local_conf="$local_conf -e XDG_RUNTIME_DIR='$XDG_RUNTIME_DIR'"
 fi
 
-docker build -t "blank/${IMAGE}" scripts/docker/"${IMAGE}"
-docker run -v "$PWD":/repo ${ci_env} "blank/${IMAGE}" /bin/bash -c "cd /repo && make -j\$(nproc) $TARGETS"
+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}"