Merge branch 'branch-v0.9' into branch-v1.0

Author: James Lee

.circleci/config.yml

@@ -0,0 +1,29 @@
+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
+      - deploy:
+          name: Push application Docker image
+          command: |
+            docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD
+            docker tag dockerapp_dockerapp $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1
+            docker tag dockerapp_dockerapp $DOCKER_HUB_USER_ID/dockerapp:latest
+            docker push $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1
+            docker push $DOCKER_HUB_USER_ID/dockerapp:latest

circle.yml

@@ -1,11 +1,12 @@
-version: '2'
+version: "3.0"
 services:
   dockerapp:
     extends:
       file: common.yml
       service: dockerapp
     build: .
-
+    depends_on:
+      - redis
   redis:
     extends:
       file: common.yml

docker-compose.yml

@@ -5,7 +5,8 @@ services:
       file: common.yml
       service: dockerapp
     image: jleetutorial/dockerapp
-
+    depends_on:
+      - redis
   redis:
     extends:
       file: common.yml