Skip to content

Commit 64882ef

Browse files
committed
Use meshinstall.sh from old build as workaround
1 parent 6ef2c3b commit 64882ef

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
FROM madebytimo/development
22

33
RUN install-autonomous.sh install Chromium DesktopBasics Firefox GoogleChrome IntellijIdea \
4-
ScriptsDesktop UnityHub VSCode && \
5-
apt update -qq && apt install -y -qq cinnamon dbus dbus-x11 x11vnc xserver-xorg-video-dummy && \
6-
rm -rf /var/lib/apt/lists/*
4+
ScriptsDesktop UnityHub VSCode \
5+
&& apt update -qq && apt install -y -qq cinnamon dbus dbus-x11 x11vnc xserver-xorg-video-dummy \
6+
&& rm -rf /var/lib/apt/lists/*
77

8-
RUN echo "X11Forwarding yes" >> /etc/ssh/sshd_config && \
9-
echo "X11UseLocalhost no" >> /etc/ssh/sshd_config
8+
COPY files/locale.gen /etc/locale.gen
9+
COPY --from=madebytimo/development-desktop:v0.0.1-base-2023-07-11 /opt/meshinstall.sh \
10+
/opt/meshinstall.sh
1011

11-
RUN usermod --append --groups audio,video,plugdev,netdev,bluetooth,lp,scanner user
12+
RUN locale-gen \
13+
&& chmod +x /opt/meshinstall.sh \
14+
&& usermod --append --groups audio,video,plugdev,netdev,bluetooth,lp,scanner user \
15+
&& echo "X11Forwarding yes" >> /etc/ssh/sshd_config \
16+
&& echo "X11UseLocalhost no" >> /etc/ssh/sshd_config
1217

1318
COPY files/xorg-dummy.conf /app/templates/xorg-dummy.conf
14-
COPY files/locale.gen /etc/locale.gen
15-
RUN locale-gen
16-
RUN curl --output /opt/meshinstall.sh "https://meshcentral.com/meshagents?script=1" && \
17-
chmod +x /opt/meshinstall.sh
18-
1919
COPY --chown=user files/autostart /media/user/.config/autostart
2020

2121
COPY files/start-desktop.sh /opt/start-desktop.sh

0 commit comments

Comments
 (0)