docker
/
docker-ubuntu-vnc-desktop
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop
1
0
Fork 0
Code Issues Releases Activity

Updated STKO Dockerfile and supervisord to make it work with paraview.

This commit is contained in:
Frank Netscher 2019-09-12 16:23:49 -05:00
parent 6b55869b88
commit 7d018745ec
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Dockerfile
View File

@ -127,37 +127,40 @@ RUN apt update \
# libxmu-dev \ # libxmu-dev \
# xterm # xterm
RUN apt-get update && apt-get install -y wget bzip2 nodejs nodejs-legacy curl gnupg gnupg2 gnupg1 && \ RUN apt-get update && apt-get install -y paraview xterm
wget -q http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh && \ #### Old Paraview installation packages:
bash Miniconda2-latest-Linux-x86_64.sh -p /miniconda -b && \ # wget bzip2 nodejs nodejs-legacy curl gnupg gnupg2 gnupg1 && \
rm Miniconda2-latest-Linux-x86_64.sh && \ # wget -q http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh && \
rm -rf /var/lib/apt/lists/* && \ # bash Miniconda2-latest-Linux-x86_64.sh -p /miniconda -b && \
apt-get purge -y wget && \ # rm Miniconda2-latest-Linux-x86_64.sh && \
conda install paraview -c bioconda -c conda-forge -y # rm -rf /var/lib/apt/lists/* && \
RUN curl -sL https://deb.nodesource.com/setup_7.x | bash # apt-get purge -y wget && \
# conda install paraview -c bioconda -c conda-forge -y
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash
RUN apt-get install -y nodejs protobuf-compiler RUN apt-get install -y nodejs protobuf-compiler
RUN npm install -g pvw-visualizer RUN npm install -g pvw-visualizer
RUN echo $CONDA/lib/paraview-5.2/ > /etc/ld.so.conf.d/paraview.conf && \ # RUN echo $CONDA/lib/paraview-5.2/ > /etc/ld.so.conf.d/paraview.conf && \
ldconfig && \ RUN ldconfig && \
mkdir /usr/local/opt/ && \ mkdir /usr/local/opt/ && \
mkdir /Applications mkdir /Applications
RUN ldconfig /usr/local/lib /miniconda/lib/paraview-5.2 # RUN ldconfig /usr/local/lib /miniconda/lib/paraview-5.2
RUN apt update \ RUN apt update \
&& apt install -y \ && apt install -y \
libxkbcommon-x11-0 libxkbcommon-x11-0
# Add paraview executable # Add paraview executable
ADD Paraview-Install /Paraview-Install # ADD Paraview.sh /Paraview.sh
ADD docker-paraviewweb/startup.sh startup.sh
# Use/overwrite script so that it uses qt libs that will be installed by online installer # Use/overwrite script so that it uses qt libs that will be installed by online installer
COPY Paraview.sh /Paraview-Install/Paraview.sh # COPY Paraview.sh /Paraview-Install/Paraview.sh
# Install qt 5.12.4 using online installer ## Install qt 5.12.4 using online installer
COPY qt_install_utils/ /qt_temp #COPY qt_install_utils/ /qt_temp
ADD http://download.qt.io/official_releases/qt/5.12/5.12.4/qt-opensource-linux-x64-5.12.4.run /qt_temp/qt-opensource-linux-x64-5.12.4.run #ADD http://download.qt.io/official_releases/qt/5.12/5.12.4/qt-opensource-linux-x64-5.12.4.run /qt_temp/qt-opensource-linux-x64-5.12.4.run
RUN chmod +x /qt_temp/qt-opensource-linux-x64-5.12.4.run #RUN chmod +x /qt_temp/qt-opensource-linux-x64-5.12.4.run
RUN /qt_temp/qt-opensource-linux-x64-5.12.4.run --script /qt_temp/qt-installer.qs -platform minimal #RUN /qt_temp/qt-opensource-linux-x64-5.12.4.run --script /qt_temp/qt-installer.qs -platform minimal
RUN rm -rf /qt_temp #RUN rm -rf /qt_temp
COPY image / COPY image /
EXPOSE 6080 EXPOSE 6080

8
image/etc/supervisor/conf.d/supervisord.conf
View File

@ -60,19 +60,19 @@ command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6
stopasgroup=true stopasgroup=true
stdout_logfile=/var/log/novnc.log stdout_logfile=/var/log/novnc.log
[program:stko] [program:paraview]
priority=35 priority=35
directory=/home/ubuntu/mydata directory=/home/ubuntu/mydata
command=xterm -r -ls -geometry 80x24+10+10 -title '*** Exit this window to kill your STKO session ***' -e '/STKO-Install/STKO.sh' command=xterm -r -ls -geometry 80x24+10+10 -title '*** Exit this window to kill your Paraview session ***' -e 'paraview'
user=ubuntu user=ubuntu
autostart=true autostart=true
autorestart=false autorestart=false
stopsignal=QUIT stopsignal=QUIT
environment=DISPLAY=":1",HOME="/home/ubuntu" environment=DISPLAY=":1",HOME="/home/ubuntu"
stdout_logfile=/var/log/qgis.log stdout_logfile=/var/log/paraview.log
redirect_stderr=true redirect_stderr=true
[eventlistener:exit] [eventlistener:exit]
command=/kill.py command=/kill.py
process_name=stko process_name=paraview
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED