Quellcode durchsuchen

Merge pull request #1 from sakurai-youhei/feature/no-socat

Remove socat for better X11 performance
Andrew Phillips vor 5 Jahren
Ursprung
Commit
aa68db9fbe
4 geänderte Dateien mit 1 neuen und 6 gelöschten Zeilen
  1. 0 1
      Dockerfile
  2. 0 1
      README.md
  3. 0 3
      conf.d/socat.conf
  4. 1 1
      conf.d/xvfb.conf

+ 0 - 1
Dockerfile

@@ -9,7 +9,6 @@ RUN set -ex; \
       git \
       net-tools \
       novnc \
-      socat \
       supervisor \
       x11vnc \
       xterm \

+ 0 - 1
README.md

@@ -9,7 +9,6 @@ This image is intended to be used for displaying X11 applications from other con
 * [x11vnc](http://www.karlrunge.com/x11vnc/) - A VNC server that scrapes the above X11 server
 * [noNVC](https://kanaka.github.io/noVNC/) - A HTML5 canvas vnc viewer
 * [Fluxbox](http://www.fluxbox.org/) - a small window manager
-* [socat](http://www.dest-unreach.org/socat/) - for use with other containers
 * [xterm](http://invisible-island.net/xterm/) - to demo that it works
 * [supervisord](http://supervisord.org) - to keep it all running
 

+ 0 - 3
conf.d/socat.conf

@@ -1,3 +0,0 @@
-[program:socat]
-command=socat tcp-listen:6000,reuseaddr,fork unix:/tmp/.X11-unix/X0
-autorestart=true

+ 1 - 1
conf.d/xvfb.conf

@@ -1,3 +1,3 @@
 [program:xvfb]
-command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24
+command=Xvfb :0 -screen 0 "%(ENV_DISPLAY_WIDTH)s"x"%(ENV_DISPLAY_HEIGHT)s"x24 -listen tcp -ac
 autorestart=true