Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

Commit

Permalink
set docker-compose project name in Makefile to avoid collisions
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
dArignac committed Apr 3, 2016
1 parent 185204c commit 803f3af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ docker-build-web:
docker build -t pricemonitor/web docker/web/

docker-up:
cd docker && docker-compose up -d
cd docker && docker-compose -p "pm" up -d

docker-stop:
cd docker && docker-compose stop
cd docker && docker-compose -p "pm" stop

docker-ps:
cd docker && docker-compose ps
cd docker && docker-compose -p "pm" ps

docker-reload: docker-build-web docker-up
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@ thus requires the celery to be restarted (execute from the ``docker`` folder!):

Start/Stop/Build
^^^^^^^^^^^^^^^^
Use the make file to execute the most common tasks:
Use the make file to execute the most common tasks. It will execute ``docker-compose`` with the project name ``pm`` resulting in the container's name pattern
``pm_*``.
::

docker-build-base: - builds the base docker image
Expand Down

0 comments on commit 803f3af

Please sign in to comment.