cherry-pick(release-1.16): do not export DISPLAY for everybody withou…

…t XVFB running PR #9795 Fixes #9756
microsoft · Oct 26, 2021 · 7ba8ba7 · 7ba8ba7
1 parent 18a0a4a
commit 7ba8ba7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/utils/docker/Dockerfile.bionic b/utils/docker/Dockerfile.bionic
@@ -31,8 +31,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
 
 ARG NOVNC_REF="1.2.0"
 ARG WEBSOCKIFY_REF="0.10.0"
-ENV DISPLAY_NUM=99
-ENV DISPLAY=":${DISPLAY_NUM}"
 
 RUN mkdir -p /opt/bin && chmod +x /dev/shm \
   && apt-get update && apt-get install -y unzip fluxbox x11vnc \

diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
@@ -31,8 +31,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
 
 ARG NOVNC_REF="1.2.0"
 ARG WEBSOCKIFY_REF="0.10.0"
-ENV DISPLAY_NUM=99
-ENV DISPLAY=":${DISPLAY_NUM}"
 
 RUN mkdir -p /opt/bin && chmod +x /dev/shm \
   && apt-get update && apt-get install -y unzip fluxbox x11vnc \

diff --git a/utils/docker/start_agent.sh b/utils/docker/start_agent.sh
@@ -2,6 +2,9 @@
 set -e
 set +x
 
+DISPLAY_NUM=99
+export DISPLAY=":${DISPLAY_NUM}"
+
 SCREEN_WIDTH=1360
 SCREEN_HEIGHT=1020
 SCREEN_DEPTH=24