Merge remote-tracking branch 'refs/remotes/tutumcloud/master'

Author: mikespub

Dockerfile

@@ -1,5 +1,5 @@
 # Using official python runtime base image
-FROM python:2.7
+FROM python:2.7-slim
 
 # Set the application directory
 WORKDIR /app

app.py

@@ -4,7 +4,7 @@
 import socket
 
 # Connect to Redis
-redis = Redis(host="redis", db=0, password=os.environ.get('REDIS_ENV_REDIS_PASS'))
+redis = Redis(host="redis", db=0)
 
 app = Flask(__name__)
 

docker-compose.test.yml

@@ -4,6 +4,4 @@ sut:
     - redis
   command: echo "Test pass!"
 redis:
-  image: tutum/redis
-  environment:
-    - REDIS_PASS=password
+  image: redis

docker-compose.yml

@@ -1,10 +1,8 @@
 web:
   build: .
   links:
-    - "redis:redis"
+    - redis
   ports:
     - "5000:80"
 redis:
-  image: tutum/redis
-  environment:
-    - REDIS_PASS=password
+  image: redis

tutum.yml

@@ -1,10 +1,8 @@
 web:
   image: tutum/quickstart-python
   links:
-    - "redis:redis"
+    - redis
   ports:
     - "5000:80"
 redis:
-  image: tutum/redis
-  environment:
-    - REDIS_PASS=password
+  image: redis