Merge branch 'branch-v0.6' into branch-v0.7

Author: James Lee

.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    working_directory: /dockerapp
+    docker:
+      - image: docker:17.05.0-ce-git
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Install dependencies
+          command: |
+            apk add --no-cache \
+              py-pip=9.0.0-r1
+            pip install \
+              docker-compose==1.15.0
+      - run:
+          name: Run tests
+          command: |
+            docker-compose up -d
+            docker-compose run dockerapp python test.py

Dockerfile

@@ -2,5 +2,6 @@ FROM python:3.5
 RUN pip install Flask==0.11.1 redis==2.10.5
 RUN useradd -ms /bin/bash admin
 USER admin
+COPY app /app
 WORKDIR /app
 CMD ["python", "app.py"] 

docker-compose.yml

@@ -1,11 +1,10 @@
-version: '2'
+version: "3.0"
 services:
   dockerapp:
     build: .
     ports:
       - "5000:5000"
-    volumes:
-      - ./app:/app
-
+    depends_on:
+      - redis
   redis:
     image: redis:3.2.0