X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=scripts%2Fdocker%2Fexec.bash;h=faabff467b259a617162922154a933385ae6f879;hb=5c44bcd4519e992219908316d453dac7dfef2d47;hp=e55ce57de700c988020c7985f9bee9d01c85b771;hpb=f4729fcfcf6f4802dd2439aa23dc3a4faf39827d;p=blank.git diff --git a/scripts/docker/exec.bash b/scripts/docker/exec.bash index e55ce57..faabff4 100755 --- a/scripts/docker/exec.bash +++ b/scripts/docker/exec.bash @@ -24,15 +24,10 @@ 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 "env && ${build_cmd}" +docker run -v "$PWD":/repo ${local_conf} "${image_name}" xvfb-run --server-args="-screen 0 1024x768x24" bash -c "env ; glewinfo | head ; ${build_cmd}"