diff --git a/install/usr/share/swarmlab.io/sec/bin/ttyd.x86_64 b/install/usr/share/swarmlab.io/sec/bin/ttyd.x86_64 new file mode 100755 index 0000000..a28891c Binary files /dev/null and b/install/usr/share/swarmlab.io/sec/bin/ttyd.x86_64 differ diff --git a/install/usr/share/swarmlab.io/sec/sec_bootstrap b/install/usr/share/swarmlab.io/sec/sec_bootstrap index a4a28a6..254de6b 100755 --- a/install/usr/share/swarmlab.io/sec/sec_bootstrap +++ b/install/usr/share/swarmlab.io/sec/sec_bootstrap @@ -48,8 +48,9 @@ case $ROLE in #firefox # /root/start-nginx.sh # Start ssh server - cd /root/noVNC/utils - ./novnc_proxy --vnc localhost:5900 --listen 0.0.0.0:6080 + ttyd -p 3787 bash & + cd /dockerstartup + ./vnc_startup.sh tail -f /dev/null #/usr/sbin/sshd -D ;; diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index 8fd4d46..14b86cd 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -177,7 +177,8 @@ if [ -d "$Wdir/project" ]; then EXPOSE 80 - EXPOSE 6080 + EXPOSE 6901 + EXPOSE 3787 EOF fi else @@ -260,7 +261,8 @@ if [ "$Wdir" == "$HOME" ]; then EXPOSE 80 - EXPOSE 6080 + EXPOSE 6901 + EXPOSE 3787 EOF fi @@ -275,6 +277,7 @@ fi /bin/cp -f $DIR/$hostnames_get $Wdir/$hostnames_get /bin/cp -f $DIR/ROOT_PASSWORD $Wdir/ROOT_PASSWORD /bin/cp -rf $DIR/.vimrc $Wdir/.vimrc +/bin/cp -rf $DIR/bin $Wdir /bin/cp -rf $DIR/install-vim-plugin.sh $Wdir/install-vim-plugin.sh @@ -295,15 +298,14 @@ services: user: root #entrypoint: ["sec_bootstrap", "role=masterservice", "sec_master_service_name=masterservice", "sec_worker_service_name=workerservice"] ports: - - "\${R_PORT1}:6080" - # - "\${R_PORT2}:3080" + - "\${R_PORT1}:6901" + - "\${R_PORT2}:3787" networks: - ${HYBRID_NETWORK} volumes: - $Wdir/project:/home/docker/project - #- $Wdir/project/package.json:/home/docker/project/package.json - #- $Wdir/project/config.default.js:/home/docker/project/config.js - #- $Wdir/$bootstrap:/usr/bin/$bootstrap + - $Wdir/$bootstrap:/usr/bin/$bootstrap + - $Wdir/bin/ttyd.x86_64:/usr/bin/ttyd # workerservice: