Skip to content

Commit

Permalink
Docker cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mattiekat committed Apr 15, 2019
1 parent 36632e3 commit c50bec0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
graphics
config
tests/config
.gitignore
.git
certs
.eggs
monarch.egg-info
.pytest_cache
.pytest_cache
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ RUN pip install --no-cache-dir -r requirements.txt \
&& python setup.py install \
&& rm -rf monarch.egg-info .eggs

VOLUME ["/monarch/config", "/monarch/certs", "/monarch/tests/config"]
VOLUME ["/monarch/config", "/monarch/tests/config"]
ENTRYPOINT ["bash"]
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ With docker up and running, run the following within the root of the git reposit
docker build -t monarch .
docker run -it \
--name monarch \
-v C:\Users\<username>\Documents\certs:/monarch/certs # Can be a different local path or be omitted
-v C:\Users\<username>\Documents\monarch\config:/monarch/config # and create the needed files from within.
monarch

Expand All @@ -51,9 +50,9 @@ yes | docker image prune
# goto FIRST Run ;)
```

Note that both certs and config are optional and do not need to be mounted, however, even if you do not have any written
Note that the config volume is optional and does not need to be mounted, however, even if you do not have any written
already, you should mount the volumes to prevent data loss when you destroy the container during the inevitable upgrade
process.
process. Also, if you plan to run tests, make sure to mount the testing config volume as well!

From within the docker image, you may now use either the python shell to interact with monarch, or chaostollkit which is
installed automatically when the image is built. You will need to login with cf-cli and bosh-cli before attempting to
Expand Down

0 comments on commit c50bec0

Please sign in to comment.