From 306b9e9bb769283a5dfabf1ff742de23c62bdf9c Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 15:13:05 +0100 Subject: [PATCH 01/10] refactor docker compose file --- common.yml | 7 +++++++ docker-compose.yml | 9 ++++++--- prod.yml | 9 ++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 common.yml diff --git a/common.yml b/common.yml new file mode 100644 index 00000000..99579bb3 --- /dev/null +++ b/common.yml @@ -0,0 +1,7 @@ +version: '2' +services: + dockerapp: + ports: + - "5000:5000" + redis: + image: redis:3.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 2c57eda6..8b6b1188 100644 --- a/docker-compose.yml +++ b/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 diff --git a/prod.yml b/prod.yml index b0096ff1..877b5bd2 100644 --- a/prod.yml +++ b/prod.yml @@ -1,9 +1,12 @@ version: '2' services: dockerapp: + extends: + file: common.yml + service: dockerapp image: jleetutorial/dockerapp - ports: - - "5000:5000" redis: - image: redis:3.2.0 + extends: + file: common.yml + service: redis From 8bddaa60639ba9d789b0821a134e70474ee0bbe5 Mon Sep 17 00:00:00 2001 From: James Lee Date: Mon, 27 Jun 2016 22:34:52 +0100 Subject: [PATCH 02/10] update docker compose file for docker swarm --- prod.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/prod.yml b/prod.yml index 877b5bd2..7e54684e 100644 --- a/prod.yml +++ b/prod.yml @@ -5,8 +5,20 @@ services: file: common.yml service: dockerapp image: jleetutorial/dockerapp + environment: + - constraint:node==master + depends_on: + - redis + networks: + - mynet redis: extends: file: common.yml service: redis + networks: + - mynet + +networks: + mynet: + driver: overlay From e6f0a7a497497b7f6dc4f50ac74e1052de5e3a69 Mon Sep 17 00:00:00 2001 From: jleetutorial Date: Wed, 28 Dec 2016 02:52:48 +0000 Subject: [PATCH 03/10] Create README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..c459f5c3 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# dockerapp +Project source code for https://www.udemy.com/docker-tutorial-for-devops-run-docker-containers From 173327deab396dfe6fa03420654bd03282ef28a2 Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Thu, 26 Jan 2017 11:42:57 -0800 Subject: [PATCH 04/10] adding docker-compose 1.9.0 for circleCI --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 700c79f9..47fc3661 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ machine: dependencies: pre: - - sudo pip install docker-compose + - sudo pip install docker-compose==1.9.0 test: override: From 8ee4696bb2f7e5882500d15c60734af13dc49bf3 Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 01:27:27 +0530 Subject: [PATCH 05/10] Delete README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index c459f5c3..00000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# dockerapp -Project source code for https://www.udemy.com/docker-tutorial-for-devops-run-docker-containers From c56fc324cd1fdb261eb45b26ac8586f7b23ebde0 Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 02:01:44 +0530 Subject: [PATCH 06/10] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..55deef4d --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# dockerapp + +successfully built in circleCI :) From 08f5c4787cbfb689f530ee319285e256556117c8 Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 02:12:12 +0530 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55deef4d..d17e3b79 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # dockerapp -successfully built in circleCI :) +successfully built in circleCI From c7a5e81788791917fecd7e092405fee2edab1c83 Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 03:22:24 +0530 Subject: [PATCH 08/10] Update circle.yml --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 47fc3661..cef2ae8c 100644 --- a/circle.yml +++ b/circle.yml @@ -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 tag dockerapp2_dockerapp_1 $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1 + - docker tag dockerapp2_dockerapp_1 $DOCKER_HUB_USER_ID/dockerapp:latest - docker push $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1 - docker push $DOCKER_HUB_USER_ID/dockerapp:latest From d0ed906978414a915aae9406621e8daa95044f1e Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 03:26:35 +0530 Subject: [PATCH 09/10] Update circle.yml --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index cef2ae8c..47fc3661 100644 --- a/circle.yml +++ b/circle.yml @@ -18,7 +18,7 @@ deployment: branch: /.*/ commands: - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD - - docker tag dockerapp2_dockerapp_1 $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1 - - docker tag dockerapp2_dockerapp_1 $DOCKER_HUB_USER_ID/dockerapp:latest + - 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 From 1fe68b7c7c2a0b9c4bfe26cd7bfd8262ad143f3a Mon Sep 17 00:00:00 2001 From: abhisheks2010 Date: Fri, 27 Jan 2017 03:31:01 +0530 Subject: [PATCH 10/10] Update circle.yml --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 47fc3661..ae4ee9f1 100644 --- a/circle.yml +++ b/circle.yml @@ -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