Merge pull request StackStorm#110 from StackStorm/wvw/container-name

Fix container name clashes

Makefile

@@ -16,4 +16,4 @@ rmi:
 	docker rmi $$(docker images -f dangling=true -q)
 
 exec:
-	docker exec -it stackstorm /bin/bash
+	docker-compose exec stackstorm /bin/bash

README.md

@@ -61,7 +61,7 @@ First, execute
   make env
   ```
 
-to create the environment files used by docker-compose. You may want to change the values of the
+to create the environment files used by `docker-compose`. You may want to change the values of the
 variables as necessary, but the defaults should be okay if you are not using any off-cluster
 services (e.g. mongo, redis, postgres, rabbitmq).
 

docker-compose.yml

@@ -3,7 +3,6 @@ version: '3'
 services:
   stackstorm:
     image: stackstorm/stackstorm:${TAG:-latest}
-    container_name: stackstorm
     env_file:
       - conf/stackstorm.env
       - conf/mongo.env
@@ -30,7 +29,6 @@ services:
 
   mongo:
     image: mongo:3.4
-    container_name: mongo
     env_file:
       - conf/mongo.env
     networks:
@@ -41,7 +39,6 @@ services:
     dns_search: .
   rabbitmq:
     image: rabbitmq:3.6-management
-    container_name: rabbitmq
     env_file:
       - conf/rabbitmq.env
     networks:
@@ -51,7 +48,6 @@ services:
     dns_search: .
   postgres:
     image: postgres:9.6
-    container_name: postgres
     env_file:
       - conf/postgres.env
     networks:
@@ -61,7 +57,6 @@ services:
     dns_search: .
   redis:
     image: redis:4.0
-    container_name: redis
     env_file:
       - conf/redis.env
     networks:

docs/tutorial.md

@@ -13,7 +13,7 @@ cp tutorial/actions/hello.yaml packs.dev/tutorial/actions
 Get a bash shell in the `stackstorm` container:
 
   ```
-  docker exec -it stackstorm /bin/bash
+  docker-compose exec stackstorm /bin/bash
   ```
 
 Load the new action into StackStorm. Whenever you change the yaml file, you need
@@ -136,10 +136,10 @@ Run the following from your docker host.
 Take a look at `monitor_file.yaml`. The `core.local` action is triggered when the
 contents of `/tmp/watcher.log` change.
 
-Use `docker exec` to connect to the `stackstorm` container:
+Use `docker-compose exec` to connect to the `stackstorm` container:
 
   ```
-  docker exec -it stackstorm /bin/bash
+  docker-compose exec stackstorm /bin/bash
   ```
 
 Run the following:
@@ -261,10 +261,10 @@ To add a simple mistral workflow, run the following from your docker host.
   cp -R tutorial/actions/workflows/mistral-basic.yaml packs.dev/tutorial/actions/workflows/mistral-basic.yaml
   ```
 
-Use `docker exec` to connect to the `stackstorm` container:
+Use `docker-compose exec` to connect to the `stackstorm` container:
 
   ```
-  docker exec -it stackstorm /bin/bash
+  docker-compose exec stackstorm /bin/bash
   ```
 
 Within the container, run the following: