From c50bec032aded58f7802a9833fb38bbc46357b0b Mon Sep 17 00:00:00 2001 From: Matthew Conover Date: Mon, 15 Apr 2019 14:39:21 -0700 Subject: [PATCH] Docker cleanup --- .dockerignore | 3 ++- Dockerfile | 2 +- README.md | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 97bd294..f54f3d8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,9 @@ graphics config +tests/config .gitignore .git certs .eggs monarch.egg-info -.pytest_cache +.pytest_cache \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 995c517..e836da2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/README.md b/README.md index 8ff0c65..9a9bf7e 100644 --- a/README.md +++ b/README.md @@ -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\\Documents\certs:/monarch/certs # Can be a different local path or be omitted -v C:\Users\\Documents\monarch\config:/monarch/config # and create the needed files from within. monarch @@ -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