Skip to content

Commit

Permalink
Update readme regarding docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeto committed Jan 24, 2019
1 parent 940500d commit 6dd311a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -29,7 +29,7 @@ As a general note, you should have `docker` and `docker-compose`
installed. Just using python and e.g. a virtualenv is possible, but installed. Just using python and e.g. a virtualenv is possible, but
discouraged. discouraged.


The simplest method is to run `docker-compose -f build/development.yml The simplest method is to run `docker-compose -f build/dev/docker-compose.yml
up -d`. up -d`.


This should automatically set up an nginx container on port 80 This should automatically set up an nginx container on port 80
Expand Down Expand Up @@ -58,11 +58,11 @@ part consists of automatic inclusion of module documentation using
How can I run the tests? How can I run the tests?
------------------------ ------------------------


For testing, there exists the docker-compose file `build/testing.yml`: For testing, there exists the docker-compose file `build/testing/docker-compose.yml`:


```shell ```shell
docker-compose -f build/testing.yml up -d docker-compose -f build/testing/docker-compose.yml up -d
docker-compose -f build/testing.yml run --rm sipa_testing python manage.py test docker-compose -f build/testing/docker-compose.yml run --rm sipa_testing python manage.py test
``` ```


…ore choose any other testing command you wish. For example, you can …ore choose any other testing command you wish. For example, you can
Expand Down

0 comments on commit 6dd311a

Please sign in to comment.