more general

travelping · Jan 29, 2024 · 444fd88 · 444fd88
1 parent 7776315
commit 444fd88
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/hack/buildenv.sh b/hack/buildenv.sh
@@ -17,8 +17,7 @@ cd "$(dirname "${BASH_SOURCE}")/.."
 : ${BUILD_TYPE:=debug}
 : ${DEV_IMAGE:=${VPP_IMAGE_BASE}_dev_${BUILD_TYPE}}
 : ${VPP_SRC:=}
-: ${UPG_BUILDENV_EXTRA_DIR:=}
-: ${UPG_BUILDENV_X11:=}
+: ${UPG_BUILDENV_EXTRA_ARGS:=}
 : ${DEVENV_BG:=}
 
 if [[ ${GITHUB_RUN_ID:-} ]]; then
@@ -45,12 +44,8 @@ function docker_buildenv {
     opts+=(-it)
   fi
 
-  if [[ ${UPG_BUILDENV_EXTRA_DIR:=} ]]; then
-    opts+=(-v "${UPG_BUILDENV_EXTRA_DIR}:${UPG_BUILDENV_EXTRA_DIR}")
-  fi
-
-  if [[ ${UPG_BUILDENV_X11:=} ]]; then
-    opts+=(-e DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix)
+  if [[ ${UPG_BUILDENV_EXTRA_ARGS:=} ]]; then
+    opts+=(${UPG_BUILDENV_EXTRA_ARGS})
   fi
 
   if [[ ${VPP_SRC} ]]; then