Yippie/docker-ubuntu
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleaned up Dockerfile.

Browse source
This commit is contained in:
Frank Netscher 2019-09-23 17:17:36 -05:00
parent ec41f6784e
commit 74f48eefb3
1 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Dockerfile
View file

@ -107,55 +107,18 @@ COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/
# Install Paraview
RUN apt update \
&& apt upgrade -y \
&& apt install build-essential -y
# old dependencies for STKO:
# RUN apt update \
# && apt install -y \
# python3-dev \
# python-pip \
# git \
# tcl8.6-dev \
# tk8.6-dev \
# libtogl-dev \
# libglu1-mesa-dev \
# freeglut3-dev \
# mesa-common-dev \
# mesa-utils \
# libxi-dev \
# libxmu-dev \
# xterm
RUN apt-get update && apt-get install -y xterm paraview
#RUN mkdir paraview
#RUN cd paraview
#RUN apt-get install wget
#RUN wget "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v5.6&type=binary&os=Linux&downloadFile=ParaView-5.6.2-MPI-Linux-64bit.tar.gz"
#RUN tar xvfz download.php\?submit\=Download\&version\=v5.6\&type\=binary\&os\=Linux\&downloadFile\=ParaView-5.6.2-MPI-Linux-64bit.tar.gz
RUN apt-get install -y qt5-default
#### 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 && \
RUN ldconfig && \
mkdir /usr/local/opt/ && \
mkdir /Applications
# RUN ldconfig /usr/local/lib /miniconda/lib/paraview-5.2
# RUN mkdir -p /opt/cdatweb
# ADD . /opt/cdatweb
# RUN pip install -r /opt/cdatweb/requirements.txt
EXPOSE 8000
CMD ["python", "/opt/cdatweb/run.py", "--port", "8000", "--upload-directory", "/opt/uvcdat/sample_data"]
@ -164,17 +127,11 @@ RUN apt update \
&& apt install -y \
libxkbcommon-x11-0
# Add paraview executable
# 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
RUN chmod +x /startup.sh
CMD /startup.sh
#RUN ./ParaView-5.6.2-MPI-Linux-64bit/bin/paraview
COPY image /
EXPOSE 6080
WORKDIR /root
@ -187,7 +144,4 @@ RUN usermod -g G-816877 ubuntu
RUN mkdir -p /home/ubuntu/.config/pcmanfm/LXDE/ && cp /usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf /home/ubuntu/.config/pcmanfm/LXDE/ && chown -R ubuntu:G-816877 /home/ubuntu/.config
COPY kill.py /
# COPY /etc/pki/tls/certs/designsafe-exec-01.tacc.utexas.edu.cer /etc/nginx/ssl/
# COPY /etc/pki/tls/private/designsafe-exec-01.tacc.utexas.edu.key /etc/nginx/ssl/
# HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://127.0.0.1:6079/api/health
ENTRYPOINT ["/startup.sh"]