diff --git a/Dockerfile b/Dockerfile index 3b605de..032cb78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,37 +127,40 @@ RUN apt update \ # libxmu-dev \ # xterm -RUN apt-get update && apt-get install -y wget bzip2 nodejs nodejs-legacy curl gnupg gnupg2 gnupg1 && \ - wget -q http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh && \ - bash Miniconda2-latest-Linux-x86_64.sh -p /miniconda -b && \ - rm Miniconda2-latest-Linux-x86_64.sh && \ - rm -rf /var/lib/apt/lists/* && \ - apt-get purge -y wget && \ - conda install paraview -c bioconda -c conda-forge -y -RUN curl -sL https://deb.nodesource.com/setup_7.x | bash +RUN apt-get update && apt-get install -y paraview xterm + #### Old Paraview installation packages: + # wget bzip2 nodejs nodejs-legacy curl gnupg gnupg2 gnupg1 && \ + # wget -q http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh && \ + # bash Miniconda2-latest-Linux-x86_64.sh -p /miniconda -b && \ + # rm Miniconda2-latest-Linux-x86_64.sh && \ + # rm -rf /var/lib/apt/lists/* && \ + # 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 npm install -g pvw-visualizer -RUN echo $CONDA/lib/paraview-5.2/ > /etc/ld.so.conf.d/paraview.conf && \ - ldconfig && \ +# RUN echo $CONDA/lib/paraview-5.2/ > /etc/ld.so.conf.d/paraview.conf && \ +RUN ldconfig && \ mkdir /usr/local/opt/ && \ 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 \ && apt install -y \ libxkbcommon-x11-0 # 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 -COPY Paraview.sh /Paraview-Install/Paraview.sh +# COPY Paraview.sh /Paraview-Install/Paraview.sh -# Install qt 5.12.4 using online installer -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 -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 rm -rf /qt_temp +## Install qt 5.12.4 using online installer +#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 +#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 rm -rf /qt_temp COPY image / EXPOSE 6080 diff --git a/image/etc/supervisor/conf.d/supervisord.conf b/image/etc/supervisor/conf.d/supervisord.conf index a5f3793..d23693f 100644 --- a/image/etc/supervisor/conf.d/supervisord.conf +++ b/image/etc/supervisor/conf.d/supervisord.conf @@ -60,19 +60,19 @@ command=bash /usr/local/lib/web/frontend/static/novnc/utils/launch.sh --listen 6 stopasgroup=true stdout_logfile=/var/log/novnc.log -[program:stko] +[program:paraview] priority=35 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 autostart=true autorestart=false stopsignal=QUIT environment=DISPLAY=":1",HOME="/home/ubuntu" -stdout_logfile=/var/log/qgis.log +stdout_logfile=/var/log/paraview.log redirect_stderr=true [eventlistener:exit] command=/kill.py -process_name=stko +process_name=paraview events=PROCESS_STATE_EXITED