fix(docker): do not export DISPLAY for everybody without XVFB running (#9795)
Fixes #9756
This commit is contained in:
parent
87c64b2c1c
commit
7927920c35
|
|
@ -31,8 +31,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
|
||||||
|
|
||||||
ARG NOVNC_REF="1.2.0"
|
ARG NOVNC_REF="1.2.0"
|
||||||
ARG WEBSOCKIFY_REF="0.10.0"
|
ARG WEBSOCKIFY_REF="0.10.0"
|
||||||
ENV DISPLAY_NUM=99
|
|
||||||
ENV DISPLAY=":${DISPLAY_NUM}"
|
|
||||||
|
|
||||||
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
|
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
|
||||||
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
|
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
|
||||||
|
|
||||||
ARG NOVNC_REF="1.2.0"
|
ARG NOVNC_REF="1.2.0"
|
||||||
ARG WEBSOCKIFY_REF="0.10.0"
|
ARG WEBSOCKIFY_REF="0.10.0"
|
||||||
ENV DISPLAY_NUM=99
|
|
||||||
ENV DISPLAY=":${DISPLAY_NUM}"
|
|
||||||
|
|
||||||
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
|
RUN mkdir -p /opt/bin && chmod +x /dev/shm \
|
||||||
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
|
&& apt-get update && apt-get install -y unzip fluxbox x11vnc \
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@
|
||||||
set -e
|
set -e
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
|
DISPLAY_NUM=99
|
||||||
|
export DISPLAY=":${DISPLAY_NUM}"
|
||||||
|
|
||||||
SCREEN_WIDTH=1360
|
SCREEN_WIDTH=1360
|
||||||
SCREEN_HEIGHT=1020
|
SCREEN_HEIGHT=1020
|
||||||
SCREEN_DEPTH=24
|
SCREEN_DEPTH=24
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue