From 34ab02dbe7d1d34c28d0b95562e0c5f96d0c5c50 Mon Sep 17 00:00:00 2001 From: devindice Date: Wed, 20 Jul 2022 22:58:56 -0400 Subject: [PATCH] Working VNC with Cloud9 Packages --- Dockerfile.amd64 | 68 +++++++--- rootfs/cloud9/ReadMe.txt | 5 + rootfs/cloud9/apt-requirements.txt | 35 +++++ rootfs/cloud9/bashrc.default | 120 ++++++++++++++++++ rootfs/etc/supervisor/conf.d/supervisord.conf | 23 +--- 5 files changed, 209 insertions(+), 42 deletions(-) create mode 100644 rootfs/cloud9/ReadMe.txt create mode 100644 rootfs/cloud9/apt-requirements.txt create mode 100644 rootfs/cloud9/bashrc.default diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index f36e07d..99f8843 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -6,15 +6,25 @@ 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; +# Copy files +COPY rootfs / + +# Ca-Certificates +RUN apt update \ + && apt install -y --no-install-recommends --allow-unauthenticated \ + ca-certificates \ + && apt autoclean -y \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* + # built-in packages ENV DEBIAN_FRONTEND noninteractive RUN apt update \ - && apt install -y --no-install-recommends software-properties-common curl apache2-utils \ + && apt install -y --no-install-recommends apt-utils software-properties-common curl \ + apache2-utils man-db manpages-posix manpages-dev manpages-posix-dev \ && apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ supervisor nginx sudo net-tools zenity xz-utils \ @@ -23,35 +33,32 @@ RUN apt update \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* + # install debs error if combine together RUN apt update \ && apt install -y --no-install-recommends --allow-unauthenticated \ - xvfb x11vnc \ - vim-tiny firefox ttf-ubuntu-font-family ttf-wqy-zenhei \ + xvfb x11vnc ttf-ubuntu-font-family ttf-wqy-zenhei \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* -RUN apt update \ - && apt install -y gpg-agent \ - && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ - && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ - && rm google-chrome-stable_current_amd64.deb \ - && rm -rf /var/lib/apt/lists/* +#RUN apt update \ +# && apt install -y gpg-agent \ +# && curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ +# && (dpkg -i ./google-chrome-stable_current_amd64.deb || apt-get install -fy) \ +# && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add \ +# && rm google-chrome-stable_current_amd64.deb \ +# && rm -rf /var/lib/apt/lists/* +# Install Desktop 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 \ + xubuntu-desktop gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \ && apt autoclean -y \ && apt autoremove -y \ && rm -rf /var/lib/apt/lists/* - -# Additional packages require ~600MB -# libreoffice pinta language-pack-zh-hant language-pack-gnome-zh-hant firefox-locale-zh-hant libreoffice-l10n-zh-tw - -# tini to fix subreap +# tini service manager ARG TINI_VERSION=v0.18.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini RUN chmod +x /bin/tini @@ -78,6 +85,23 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /var/cache/apt/* /tmp/a.txt /tmp/b.txt +# Install Additonal Packages +RUN apt update \ + && grep -v '^#' /cloud9/apt-requirements.txt | xargs apt install -y --no-install-recommends --allow-unauthenticated \ + && apt autoclean -y \ + && apt autoremove -y \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /workspace + +# Clone and install cloud9 +RUN git clone https://github.com/c9/core.git /cloud9/c9sdk +RUN mkdir -p /cloud9/c9sdk/build /workspace/.ubuntu/.standalone +RUN ln -sf /workspace/.ubuntu/.standalone /cloud9/c9sdk/build/standalone +RUN /cloud9/c9sdk/scripts/install-sdk.sh +RUN cd /cloud9/c9sdk && git reset --hard +RUN wget -P /cloud9/ -O user-install.sh https://raw.githubusercontent.com/c9/install/master/install.sh + ################################################################################ # builder @@ -114,15 +138,17 @@ RUN sed -i 's#app/locale/#novnc/app/locale/#' /src/web/dist/static/novnc/app/ui. # merge ################################################################################ FROM system -LABEL maintainer="fcwu.tw@gmail.com" +LABEL maintainer="info@devindice.com" COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/ -COPY rootfs / + RUN ln -sf /usr/local/lib/web/frontend/static/websockify /usr/local/lib/web/frontend/static/novnc/utils/websockify && \ chmod +x /usr/local/lib/web/frontend/static/websockify/run EXPOSE 80 -WORKDIR /root +EXPOSE 9999 + +WORKDIR /workspace ENV HOME=/home/ubuntu \ SHELL=/bin/bash HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health diff --git a/rootfs/cloud9/ReadMe.txt b/rootfs/cloud9/ReadMe.txt new file mode 100644 index 0000000..9e3ad1d --- /dev/null +++ b/rootfs/cloud9/ReadMe.txt @@ -0,0 +1,5 @@ +Failing to generate a key using the below path will cause the key to delete after a routine update to the cluster. After the upgrade, use the command above to generate a new key for it to be persistent + +Generate percistent SSH key using otherwise it will delete on upgrade: +#ssh-keygen -t ed25519 -f /workspace/.%USER%/.ssh/id_ed25519 -C "%USER%@%DOMAIN%" + diff --git a/rootfs/cloud9/apt-requirements.txt b/rootfs/cloud9/apt-requirements.txt new file mode 100644 index 0000000..feb63d4 --- /dev/null +++ b/rootfs/cloud9/apt-requirements.txt @@ -0,0 +1,35 @@ +# System Packages +#systemctl << Breaks system +sudo +net-tools +locate +curl +vim +#vim-tiny +wget +lsb-release +iputils-ping +dnsutils +telnet +less +util-linux +xfce4-terminal + +# Cloud9 +git +ruby +locales-all +tmux +nodejs +python2.7 +build-essential +npm + +# Docker +gnupg + +# Additional Software +libreoffice +pinta +firefox +#chrome? diff --git a/rootfs/cloud9/bashrc.default b/rootfs/cloud9/bashrc.default new file mode 100644 index 0000000..9855912 --- /dev/null +++ b/rootfs/cloud9/bashrc.default @@ -0,0 +1,120 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend +export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND" +export HISTFILE=/workspace/.bash_history + + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=10000 +HISTFILESIZE=20000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi \ No newline at end of file diff --git a/rootfs/etc/supervisor/conf.d/supervisord.conf b/rootfs/etc/supervisor/conf.d/supervisord.conf index fc48e6d..6a6dddb 100644 --- a/rootfs/etc/supervisor/conf.d/supervisord.conf +++ b/rootfs/etc/supervisor/conf.d/supervisord.conf @@ -17,35 +17,16 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/fd/1 stderr_logfile_maxbytes=0 - [group:x] -programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc - -[program:wm] -priority=15 -command=/usr/bin/openbox -environment=DISPLAY=":1",HOME="/root",USER="root" +programs=xvfb,lxpanel,x11vnc,novnc [program:lxpanel] priority=15 directory=%HOME% -command=/usr/bin/lxpanel --profile LXDE +command=/usr/bin/startxfce4 user=%USER% environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" -[program:pcmanfm] -priority=15 -directory=%HOME% -command=/usr/bin/pcmanfm --desktop --profile LXDE -user=%USER% -stopwaitsecs=3 -environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" - - - - - - [program:xvfb] priority=10 command=/usr/local/bin/xvfb.sh