Skip to content

Commit 69b581c

Browse files
authored
fixes to VNC image (#65)
* fix typo in readme * improve default desktop and window scaling * switch to firefox as default browser something about our network or install method in Google chrome leads to errors when browsing
1 parent abf3ddb commit 69b581c

File tree

6 files changed

+36
-43
lines changed

6 files changed

+36
-43
lines changed

images/vnc/Dockerfile.ubuntu

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ RUN apt-get remove -y \
4949

5050
RUN locale-gen en_US.UTF-8
5151

52-
RUN curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
53-
&& apt-get install -y ./google-chrome-stable_current_amd64.deb \
54-
&& rm google-chrome-stable_current_amd64.deb
55-
5652
ARG HOME=/home/coder
5753
ARG VNC_ROOT_DIR=/opt/vnc
5854

images/vnc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A [sample image](https://github.com/cdr/enterprise-images/tree/main/images/vnc)
1010
```sh
1111
coder config-ssh
1212
# Forward the remote VNC server to your local machine
13-
ssh -L -N 5990:localhost:localhost:5990 coder.[env-name]
13+
ssh -L -N 5990:localhost:5990 coder.[env-name]
1414
# You will not see any output if it succeeds, but you
1515
# will be able to connect your VNC client to localhost:5990
1616
```

images/vnc/xfce4/helpers.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WebBrowser=google-chrome
1+
WebBrowser=firefox
Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<channel name="displays" version="1.0">
4-
<property name="ActiveProfile" type="string" value="Default"/>
5-
<property name="Default" type="empty">
6-
<property name="VNC-0" type="string" value="VNC-0">
7-
<property name="Active" type="bool" value="true"/>
8-
<property name="EDID" type="string" value=""/>
9-
<property name="Resolution" type="string" value="3840x2160"/>
10-
<property name="RefreshRate" type="double" value="60.000000"/>
11-
<property name="Rotation" type="int" value="0"/>
12-
<property name="Reflection" type="string" value="0"/>
13-
<property name="Primary" type="bool" value="false"/>
14-
<property name="Position" type="empty">
15-
<property name="X" type="int" value="0"/>
16-
<property name="Y" type="int" value="0"/>
1+
<channel name="xfce4-desktop" version="1.0">
2+
<property name="backdrop" type="empty">
3+
<property name="screen0" type="empty">
4+
<property name="monitor0" type="empty">
5+
<property name="workspace0" type="empty">
6+
<property name="color-style" type="int" value="0"/>
7+
<property name="image-style" type="int" value="4"/>
8+
<property name="last-image" type="string" value="/home/coder/.config/xfce4/coder-bg.jpg"/>
9+
</property>
10+
<property name="workspace1" type="empty">
11+
<property name="color-style" type="int" value="0"/>
12+
<property name="image-style" type="int" value="4"/>
13+
<property name="last-image" type="string" value="/home/coder/.config/xfce4/coder-bg.jpg"/>
14+
</property>
15+
<property name="workspace2" type="empty">
16+
<property name="color-style" type="int" value="0"/>
17+
<property name="image-style" type="int" value="4"/>
18+
<property name="last-image" type="string" value="/home/coder/.config/xfce4/coder-bg.jpg"/>
19+
</property>
20+
<property name="workspace3" type="empty">
21+
<property name="color-style" type="int" value="0"/>
22+
<property name="image-style" type="int" value="4"/>
23+
<property name="last-image" type="string" value="/home/coder/.config/xfce4/coder-bg.jpg"/>
24+
</property>
25+
<property name="image-path" type="string" value="/home/coder/.config/xfce4/coder-bg.jpg"/>
26+
<property name="image-show" type="bool" value="true"/>
27+
<property name="image-style" type="string" value="scaled"/>
1728
</property>
1829
</property>
1930
</property>
20-
<property name="Fallback" type="empty">
21-
<property name="VNC-0" type="string" value="VNC-0">
22-
<property name="Active" type="bool" value="true"/>
23-
<property name="EDID" type="string" value=""/>
24-
<property name="Resolution" type="string" value="1900x1200"/>
25-
<property name="RefreshRate" type="double" value="60.000000"/>
26-
<property name="Rotation" type="int" value="0"/>
27-
<property name="Reflection" type="string" value="0"/>
28-
<property name="Primary" type="bool" value="false"/>
29-
<property name="Position" type="empty">
30-
<property name="X" type="int" value="0"/>
31-
<property name="Y" type="int" value="0"/>
32-
</property>
33-
</property>
31+
<property name="last" type="empty">
32+
<property name="window-width" type="int" value="1280"/>
33+
<property name="window-height" type="int" value="1024"/>
3434
</property>
35-
</channel>
35+
</channel>

images/vnc/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
<property name="snap_to_windows" type="bool" value="false"/>
5959
<property name="snap_width" type="int" value="10"/>
6060
<property name="vblank_mode" type="string" value="auto"/>
61-
<property name="theme" type="string" value="Default-xhdpi"/>
61+
<property name="theme" type="string" value="Greybird-dark"/>
6262
<property name="tile_on_move" type="bool" value="true"/>
6363
<property name="title_alignment" type="string" value="center"/>
64-
<property name="title_font" type="string" value="Sans Bold 20"/>
64+
<property name="title_font" type="string" value="Sans Bold 10"/>
6565
<property name="title_horizontal_offset" type="int" value="0"/>
6666
<property name="titleless_maximize" type="bool" value="false"/>
6767
<property name="title_shadow_active" type="string" value="false"/>

images/vnc/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
<property name="DecorationLayout" type="empty"/>
3838
</property>
3939
<property name="Gdk" type="empty">
40-
<property name="WindowScalingFactor" type="int" value="2"/>
41-
</property>
42-
<property name="Xfce" type="empty">
43-
<property name="LastCustomDPI" type="int" value="112"/>
40+
<property name="WindowScalingFactor" type="int" value="1"/>
4441
</property>
4542
</channel>

0 commit comments

Comments
 (0)