minor change

This commit is contained in:
fxia22 2017-09-24 01:33:41 -07:00
parent 9efa3e031e
commit 4df397ae77
3 changed files with 9 additions and 140 deletions

7
.gitignore vendored
View File

@ -5,7 +5,6 @@
.DS_Store
*.pth
src/
Dockerfile
pw
*.o
*.ipynb
@ -13,6 +12,10 @@ pw
npz/
11HB6XZSh1Q/
11HB6XZSh1Q*/
coord.npy
*.npy
dev/transfer.c
*.jpg
*.png
*.bmp
*.bak
*.zip

View File

@ -1,137 +0,0 @@
## Scratch ubuntu:16.04 image with NVIDIA GPU
FROM nvidia/cuda
## Skip keyboard settings
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update \
&& apt-get install -y libav-tools \
libpq-dev \
libjpeg-dev \
cmake \
wget \
unzip \
git \
xpra \
vnc4server \
golang-go \
libboost-all-dev \
make \
&& apt-get clean
## This line raises error when building docker image
# && rm -rf /var/lib/apt/lists/* \
## Install conda, opencv
RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.3.14-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
ENV PATH /opt/conda/bin:$PATH
RUN conda install -c menpo opencv -y
#RUN conda install -y \
# scikit-image \
# flask \
# pillow
RUN conda install pytorch torchvision cuda80 -c soumith
## Install Universe
WORKDIR /usr/local/realenv
RUN git clone https://github.com/openai/universe.git
WORKDIR /usr/local/realenv/universe
RUN pip install -e .
## Install Realenv
WORKDIR /usr/local/realenv
RUN wget https://www.dropbox.com/s/xmhgkmhgp9dfw52/realenv.tar.gz && tar -xvzf realenv.tar.gz && rm realenv.tar.gz
WORKDIR /usr/local/realenv/realenv
RUN pip install -e .
RUN pip install progressbar
## Set up data & model for view synthesizer
#nvidia-docker run -it --rm -v realenv-data:/usr/local/realenv/data realenv bash
## Start VNC server
#RUN apt-get install -y x11vnc xvfb
#RUN mkdir ~/.vnc
# Setup a password
#RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
COPY . /usr/local/realenv/
## Entry point
WORKDIR /usr/local/realenv/
RUN ["chmod", "+x", "/usr/local/realenv/init.sh"]
#ENTRYPOINT ["/usr/local/realenv/init.sh"]
#ENTRYPOINT [ "/bin/bash", "-c" ]
#CMD ["x11vnc", "-forever", "-usepw", "-create"]
LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \
io.k8s.display-name="Headless VNC Container based on Ubuntu" \
io.openshift.expose-services="6901:http,5901:xvnc" \
io.openshift.tags="vnc, ubuntu, xfce" \
io.openshift.non-scalable=true
## Connection ports for controlling the UI:
# VNC port:5901
# noVNC webport, connect via http://IP:6901/?password=vncpassword
ENV DISPLAY :1
ENV VNC_PORT 5901
ENV NO_VNC_PORT 6901
EXPOSE $VNC_PORT $NO_VNC_PORT
ENV HOME /usr/local/realenv/
ENV STARTUPDIR /dockerstartup
WORKDIR $HOME
### Envrionment config
ENV DEBIAN_FRONTEND noninteractive
ENV NO_VNC_HOME $HOME/noVNC
ENV VNC_COL_DEPTH 24
ENV VNC_RESOLUTION 1280x1024
ENV VNC_PW vncpassword
### Add all install scripts for further steps
ENV INST_SCRIPTS $HOME/install
ADD ./src/common/install/ $INST_SCRIPTS/
ADD ./src/ubuntu/install/ $INST_SCRIPTS/
RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} +
### Install some common tools
RUN $INST_SCRIPTS/tools.sh
ADD ./init.sh $HOME/
### Install xvnc-server & noVNC - HTML5 based VNC viewer
RUN $INST_SCRIPTS/tigervnc.sh
RUN $INST_SCRIPTS/no_vnc.sh
### Install firfox and chrome browser
#RUN $INST_SCRIPTS/firefox.sh
#RUN $INST_SCRIPTS/chrome.sh
### Install xfce UI
#RUN $INST_SCRIPTS/xfce_ui.sh
#ADD ./src/common/xfce/ $HOME/
### configure startup
RUN $INST_SCRIPTS/libnss_wrapper.sh
ADD ./src/common/scripts $STARTUPDIR
RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME
USER 1984
ENTRYPOINT [ "/bin/bash", "-c" ]
#ENTRYPOINT ["/dockerstartup/vnc_startup.sh"]
CMD ["--tail-log"]

3
depth/external/download.sh vendored Executable file
View File

@ -0,0 +1,3 @@
wget https://github.com/glfw/glfw/releases/download/3.1.2/glfw-3.1.2.zip
unzip glfw-3.1.2.zip