u1 changes

ubuntu/docker-ubuntu-vnc-desktop/Dockerfile.my

@@ -8,7 +8,7 @@ FROM ubuntu:20.04 as system
 
 
 
-RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list;
+#RUN sed -i 's#http://archive.ubuntu.com/ubuntu/#mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list;
 
 
 # built-in packages
@@ -43,7 +43,14 @@ RUN apt update \
 RUN apt update \
     && apt install -y --no-install-recommends --allow-unauthenticated \
         lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
-        iputils-ping net-tools screen chromium-browser \
+        iputils-ping net-tools gnome-disk-utility gparted screen chromium-browser openssh-server rsync ibus ibus-pinyin xrdp \
+    && apt autoclean -y \
+    && apt autoremove -y \
+    && rm -rf /var/lib/apt/lists/* 
+
+RUN apt update \
+    && echo '31\n\1' | apt install -y --no-install-recommends --allow-unauthenticated \
+        xorgxrdp \
     && apt autoclean -y \
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/* 
@@ -65,6 +72,16 @@ RUN apt update \
     && mkdir /usr/local/ffmpeg \
     && ln -s /usr/bin/ffmpeg /usr/local/ffmpeg/ffmpeg
 
+
+# install citrix workspace
+COPY rootfs/citrix/icaclient_21.12.0.18_amd64.deb /tmp/ 
+RUN apt update \ 
+    && echo '1\n' | apt install -y --no-install-recommends --allow-unauthenticated \
+        libidn11 \
+    && dpkg -i /tmp/icaclient_21.12.0.18_amd64.deb
+
+
+
 # python library
 COPY rootfs/usr/local/lib/web/backend/requirements.txt /tmp/
 RUN apt-get update \
@@ -80,10 +97,9 @@ RUN apt-get update \
     && rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt
 
 
-RUN apt update && apt-get install -y snapd squashfuse fuse
-RUN systemctl enable snapd
 #CMD [ "/sbin/init" ]
 #RUN snap install chromium
+RUN adduser xrdp ssl-cert
 
 
 ################################################################################
@@ -116,7 +132,6 @@ RUN cd /src/web \
 RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui.js
 
 
-
 ################################################################################
 # merge
 ################################################################################
@@ -129,6 +144,9 @@ RUN ln -sf /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/fron
 	chmod +x /usr/local/lib/web/frontend/static/websockify/run
 
 EXPOSE 80
+EXPOSE 3389
+EXPOSE 11897 11898
+
 WORKDIR /root
 ENV HOME=/home/ubuntu \
     SHELL=/bin/bash

ubuntu/docker-ubuntu-vnc-desktop/rootfs/startup.sh

@@ -32,11 +32,26 @@ if [ "$USER" != "root" ]; then
     HOME=/home/$USER
     echo "$USER:$PASSWORD" | chpasswd
     cp -r /root/{.config,.gtkrc-2.0,.asoundrc} ${HOME}
+    # IB stuff
+    cp -r /ib/Jts ${HOME}/.
+    cp -r /ib/{.i4j_jres,.oracle_jre_usage} ${HOME}/.
+#    rm -Rf /ib
     chown -R $USER:$USER ${HOME}
     [ -d "/dev/snd" ] && chgrp -R adm /dev/snd
+
+    # turtle stuff
+    cp -r /turtle/. ${HOME}/.
+
 fi
 sed -i -e "s|%USER%|$USER|" -e "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf
 
+if [ ! -x "$HOME/Desktop" ]; then
+    mkdir -p $HOME/Desktop
+    cp /ib/Trader_Workstation.desktop ${HOME}/Desktop/'Trader Workstation.desktop'
+    sed -i -e ":a; s|%USER%|$USER|; ta" ${HOME}/Desktop/'Trader Workstation.desktop' 
+    chown -R $USER:$USER $HOME
+fi
+
 # home folder
 if [ ! -x "$HOME/.config/pcmanfm/LXDE/" ]; then
     mkdir -p $HOME/.config/pcmanfm/LXDE/
@@ -68,6 +83,13 @@ if [ -n "$RELATIVE_URL_ROOT" ]; then
 	sed -i 's|_RELATIVE_URL_ROOT_|'$RELATIVE_URL_ROOT'|' /etc/nginx/sites-enabled/default
 fi
 
+# 
+# start openssh-server
+adduser xrdp ssl-cert
+service ssh start
+service xrdp start
+
+
 # clearup
 PASSWORD=
 HTTP_PASSWORD=