circleci1

README.md

@@ -0,0 +1,3 @@
+# dockerapp
+
+successfully built in circleCI

circle.yml

@@ -6,7 +6,7 @@ machine:
 
 dependencies:
   pre:
-    - sudo pip install docker-compose
+    - sudo pip install docker-compose==1.9.0
 
 test:
   override:
@@ -18,7 +18,7 @@ deployment:
     branch: /.*/
     commands:
       - 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
+      - docker tag dockerapp_dockerapp $DOCKER_HUB_USER_ID/dockerapp1:$CIRCLE_SHA1
+      - docker tag dockerapp_dockerapp $DOCKER_HUB_USER_ID/dockerapp1:latest
+      - docker push $DOCKER_HUB_USER_ID/dockerapp1:$CIRCLE_SHA1
+      - docker push $DOCKER_HUB_USER_ID/dockerapp1:latest

common.yml

@@ -0,0 +1,7 @@
+version: '2'
+services:
+  dockerapp:
+    ports:
+      - "5000:5000"
+  redis:
+    image: redis:3.2.0

docker-compose.yml

@@ -1,9 +1,12 @@
 version: '2'
 services:
   dockerapp:
+    extends:
+      file: common.yml
+      service: dockerapp
     build: .
-    ports:
-      - "5000:5000"
 
   redis:
-    image: redis:3.2.0
+    extends:
+      file: common.yml
+      service: redis

prod.yml

@@ -1,9 +1,24 @@
 version: '2'
 services:
   dockerapp:
+    extends:
+      file: common.yml
+      service: dockerapp
     image: jleetutorial/dockerapp
-    ports:
-      - "5000:5000"
+    environment:
+      - constraint:node==master
+    depends_on:
+      - redis
+    networks:
+      - mynet
 
   redis:
-    image: redis:3.2.0
+    extends:
+      file: common.yml
+      service: redis
+    networks:
+      - mynet
+
+networks:
+  mynet:
+    driver: overlay