Skip to content

Commit

Permalink
Updated the Dockerfile and documentation (#312)
Browse files Browse the repository at this point in the history
* Updated the documentation for building the Docker image and updated the Dockerfile to use Python 3

* Updated the Dockerfile format
  • Loading branch information
jsemler authored Sep 5, 2020
1 parent fda0aaf commit 864c12f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
FROM ubuntu
LABEL maintainer="Francesco Di Natale dinatale3@llnl.gov"

RUN apt-get update && apt-get install -y python python-pip git
RUN apt-get update && apt-get install -y \
python3 \
python3-pip \
git
ADD . /maestrowf
RUN pip install -U /maestrowf
RUN python3 -m pip install -U /maestrowf
4 changes: 2 additions & 2 deletions docs/source/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Maestro Docker Container

In order to set up the Docker container execute the following from the root of the Maestro repository::

$ docker --build -t maestrowf .
$ docker build -t maestrowf .

To launch the interactive shell of the Ubuntu image simply run::

Expand All @@ -25,7 +25,7 @@ Once inside the Docker container, the following should bring up help::

$ maestro -h

For more information on using Dockerfiles, checkout Docker's `documentation <https://docs.docker.com/engine/reference/builder/>`.
For more information on using Dockerfiles, checkout Docker's `documentation <https://docs.docker.com/engine/reference/builder/>`_.


Once installed run::
Expand Down

0 comments on commit 864c12f

Please sign in to comment.