(try to) switch to Xorg + dummy

ubuntu-xvd
Tomohisa Kusano 9 years ago
parent 91c92227b1
commit 4e725e9bc6

@ -1,4 +1,4 @@
FROM ubuntu:14.04
FROM siomiz/ubuntu-xvd
MAINTAINER Tomohisa Kusano <siomiz@gmail.com>
@ -23,7 +23,9 @@ RUN apt-key add /tmp/linux_signing_key.pub \
&& useradd -m -G chrome-remote-desktop,pulse-access chrome \
&& ln -s /crdonly /usr/local/sbin/crdonly \
&& ln -s /update /usr/local/sbin/update \
&& ln -s /update /etc/cron.hourly/update
&& ln -s /update /etc/cron.hourly/update \
&& ln -s /usr/bin/Xorg /usr/bin/Xvfb-randr \
&& patch -d /opt/google/chrome-remote-desktop -p0 < /crd-xvd.patch
VOLUME ["/home/chrome"]

@ -0,0 +1,23 @@
--- chrome-remote-desktop.dist 2015-10-07 20:47:34.445286514 +0000
+++ chrome-remote-desktop 2015-10-07 20:48:03.121919734 +0000
@@ -385,7 +385,6 @@
"-auth", x_auth_file,
"-nolisten", "tcp",
"-noreset",
- "-screen", "0", screen_option
] + extra_x_args)
if not self.x_proc.pid:
raise Exception("Could not start Xvfb.")
@@ -433,10 +432,7 @@
# dimensions from the "-screen" option.
for width, height in self.sizes:
label = "%dx%d" % (width, height)
- args = ["xrandr", "--newmode", label, "0", str(width), "0", "0", "0",
- str(height), "0", "0", "0"]
- subprocess.call(args, env=self.child_env, stdout=devnull, stderr=devnull)
- args = ["xrandr", "--addmode", "screen", label]
+ args = ["xrandr", "--fb", label]
subprocess.call(args, env=self.child_env, stdout=devnull, stderr=devnull)
# Set the initial mode to the first size specified, otherwise the X server

@ -0,0 +1,29 @@
Section "Files"
ModulePath "/usr/lib/xorg/modules,/usr/local/lib/xorg/modules"
EndSection
Section "Device"
Identifier "Configured Video Device"
Driver "dummy"
VideoRam 16384
EndSection
Section "Monitor"
Identifier "Configured Monitor"
HorizSync 5.0 - 1000.0
VertRefresh 5.0 - 200.0
Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
EndSection
Section "Screen"
Identifier "Default Screen"
Monitor "Configured Monitor"
Device "Configured Video Device"
DefaultDepth 24
SubSectionSub "Display"
Viewport 0 0
Depth 24
Virtual 1600 900
EndSubSection
EndSection

@ -2,8 +2,8 @@
nodaemon=true
[program:crd]
environment=HOME="/home/chrome",USER="chrome",CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES="1024x768"
command=/usr/bin/python /opt/google/chrome-remote-desktop/chrome-remote-desktop --start --foreground --config=/home/chrome/.config/chrome-remote-desktop/~host.json
environment=HOME="/home/chrome",USER="chrome",CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES="3840x2160"
command=/usr/bin/python /opt/google/chrome-remote-desktop/chrome-remote-desktop --start --foreground --config=/home/chrome/.config/chrome-remote-desktop/~host.json -- -logfile /dev/null
user=chrome
autorestart=true
priority=200

Binary file not shown.
Loading…
Cancel
Save