Skip to content

Commit

Permalink
Fixed Dockerfiles to install tzdata and the correct iPython version.
Browse files Browse the repository at this point in the history
  • Loading branch information
ICGog committed Jan 20, 2020
1 parent ab20a1b commit e74da89
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docker/Dockerfile_pylot_Ubuntu16.04
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ WORKDIR /home/erdos/workspace/pylot/
# Cython is required by sci*, but its not a dependency in their setup.py.
RUN pip3 install cython
# Get the Pylot models and code dependencies.
RUN sudo apt-get install -y wget
RUN sudo apt-get install -y wget libpng16-dev python-opencv
RUN cd /home/erdos/workspace/pylot/ && ./install.sh docker
# Install all the Python dependencies.
RUN cd /home/erdos/workspace/pylot/ && pip3 install -e ./
RUN cd /home/erdos/workspace/pylot/ && pip3 install -e ./
# IPython 7.0 is required by Python 3.5.
RUN pip3 uninstall --yes ipython && pip3 install ipython==7.0

# Set this env value to run carla in headless CARLA
ENV SDL_VIDEODRIVER offscreen
Expand Down
5 changes: 5 additions & 0 deletions docker/Dockerfile_pylot_Ubuntu18.04
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ ENV SHELL /bin/bash
WORKDIR /home/erdos
SHELL ["/bin/bash", "-c"]

# Install tzdata without prompt.
RUN sudo apt-get -y update
ENV DEBIAN_FRONTEND=noninteractive
RUN sudo DEBIAN_FRONTEND=noninteractive sudo DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata

# Get the erdos directory.
RUN sudo apt-get -y update
RUN sudo apt-get -y install git curl clang python3 python3-pip
Expand Down

0 comments on commit e74da89

Please sign in to comment.