move env inside docker container

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

diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash
index ec61e1b6e5f88a5f58782768d9ef44594d1d7fa4..e55ce57de700c988020c7985f9bee9d01c85b771 100755 (executable)
--- a/scripts/docker/exec.bash
+++ b/scripts/docker/exec.bash
@@ -10,7 +10,7 @@
 IMAGE="${IMAGE:-archlinux-build}"
 
 image_name="localhorsttv/${IMAGE}"
-image_path="scripts/docker/${IMAGE}"
+image_path="scripts/docker/${IMAGE//:/-}"
 
 build_cmd="cd /repo && make -j\$(nproc) $TARGETS"
 
@@ -24,5 +24,15 @@ if [ -e "${image_path}/env" ]; then
        local_conf="$local_conf --env-file ${image_path}/env"
 fi
 
+# copy DISPLAY if set
+if [ "$DISPLAY" != "" ]; then
+       local_conf="$local_conf -e DISPLAY=$DISPLAY"
+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 "${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}" /bin/bash -c "env && ${build_cmd}"