crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled TurboVNC

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2019-09-04 19:47:57 +02:00
parent 526a5ba576
commit 0d7f78ca3a
3 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Dockerfile.m4
View File

@@ -130,23 +130,23 @@ RUN dpkg -i --force-architecture ./virtualgl32_*.deb
]])m4_dnl ]])m4_dnl
# Build TurboVNC # Build TurboVNC
ARG TURBOVNC_TREEISH=2.2.2 #ARG TURBOVNC_TREEISH=
ARG TURBOVNC_REMOTE=https://github.com/TurboVNC/turbovnc.git #ARG TURBOVNC_REMOTE=https://github.com/TurboVNC/turbovnc.git
WORKDIR /tmp/turbovnc/ #WORKDIR /tmp/turbovnc/
RUN git clone "${TURBOVNC_REMOTE:?}" ./ #RUN git clone "${TURBOVNC_REMOTE:?}" ./
RUN git checkout "${TURBOVNC_TREEISH:?}" #RUN git checkout "${TURBOVNC_TREEISH:?}"
RUN git submodule update --init --recursive #RUN git submodule update --init --recursive
WORKDIR ./build/ #WORKDIR ./build/
RUN cmake ./ \ #RUN cmake ./ \
-G 'Unix Makefiles' \ # -G 'Unix Makefiles' \
-D PKGNAME=turbovnc \ # -D PKGNAME=turbovnc \
-D CMAKE_BUILD_TYPE=Release \ # -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=/opt/TurboVNC \ # -D CMAKE_INSTALL_PREFIX=/opt/TurboVNC \
-D CMAKE_POSITION_INDEPENDENT_CODE=1 \ # -D CMAKE_POSITION_INDEPENDENT_CODE=1 \
-D TVNC_BUILDJAVA=0 \ # -D TVNC_BUILDJAVA=0 \
../ # ../
RUN make -j"$(nproc)" && make deb #RUN make -j"$(nproc)" && make deb
RUN dpkg -i --force-architecture ./turbovnc_*.deb #RUN dpkg -i --force-architecture ./turbovnc_*.deb
# Build XRDP # Build XRDP
ARG XRDP_TREEISH=v0.9.11 ARG XRDP_TREEISH=v0.9.11
@@ -371,9 +371,9 @@ COPY --from=build --chown=root:root /tmp/virtualgl/build32/virtualgl32_*.deb /tm
RUN dpkg -i --force-architecture /tmp/virtualgl32.deb && rm -f /tmp/virtualgl32.deb RUN dpkg -i --force-architecture /tmp/virtualgl32.deb && rm -f /tmp/virtualgl32.deb
]])m4_dnl ]])m4_dnl
# Install TurboVNC from package ## Install TurboVNC from package
COPY --from=build --chown=root:root /tmp/turbovnc/build/turbovnc_*.deb /tmp/turbovnc.deb #COPY --from=build --chown=root:root /tmp/turbovnc/build/turbovnc_*.deb /tmp/turbovnc.deb
RUN dpkg -i --force-architecture /tmp/turbovnc.deb && rm -f /tmp/turbovnc.deb #RUN dpkg -i --force-architecture /tmp/turbovnc.deb && rm -f /tmp/turbovnc.deb
# Install XRDP from package # Install XRDP from package
COPY --from=build --chown=root:root /tmp/xrdp/xrdp_*.deb /tmp/xrdp.deb COPY --from=build --chown=root:root /tmp/xrdp/xrdp_*.deb /tmp/xrdp.deb
@@ -397,7 +397,8 @@ ENV UNPRIVILEGED_USER_SHELL=/bin/bash
ENV DISABLE_GPU=false ENV DISABLE_GPU=false
ENV RDP_TLS_KEY_PATH=/etc/xrdp/key.pem ENV RDP_TLS_KEY_PATH=/etc/xrdp/key.pem
ENV RDP_TLS_CERT_PATH=/etc/xrdp/cert.pem ENV RDP_TLS_CERT_PATH=/etc/xrdp/cert.pem
ENV PATH=/opt/VirtualGL/bin:/opt/TurboVNC/bin:${PATH} ENV PATH=/opt/VirtualGL/bin:${PATH}
#ENV PATH=/opt/TurboVNC/bin:${PATH}
ENV VGL_DISPLAY=:0 ENV VGL_DISPLAY=:0
## Workaround for AMDGPU X_GLXCreatePbuffer issue: ## Workaround for AMDGPU X_GLXCreatePbuffer issue:
## https://github.com/VirtualGL/virtualgl/issues/85#issuecomment-480291529 ## https://github.com/VirtualGL/virtualgl/issues/85#issuecomment-480291529

16
config/xrdp/sesman.ini
View File

@@ -33,14 +33,14 @@ param=-noreset
param=-nolisten param=-nolisten
param=tcp param=tcp
[Xvnc] ;[Xvnc]
param=/opt/TurboVNC/bin/Xvnc ;param=/opt/TurboVNC/bin/Xvnc
param=-bs ;param=-bs
param=-nolisten ;param=-nolisten
param=tcp ;param=tcp
param=-localhost ;param=-localhost
param=-dpi ;param=-dpi
param=96 ;param=96
[Chansrv] [Chansrv]
FuseMountName=.thinclient_drives FuseMountName=.thinclient_drives

14
config/xrdp/xrdp.ini
View File

@@ -67,10 +67,10 @@ ip=127.0.0.1
port=-1 port=-1
code=20 code=20
[Xvnc] ;[Xvnc]
name=Xvnc ;name=Xvnc
lib=libvnc.so ;lib=libvnc.so
username=ask ;username=ask
password=ask ;password=ask
ip=127.0.0.1 ;ip=127.0.0.1
port=-1 ;port=-1