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 09e93df6801b31b814843972abdc36977702b36a Mon Sep 17 00:00:00 2001 From: BalajiSivarajRajan Date: Mon, 26 Jun 2017 22:52:09 +0100 Subject: [PATCH 04/10] Update circle.yml --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 700c79f9..37709910 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,7 @@ machine: dependencies: pre: + - sudo pip install --upgrade pip - sudo pip install docker-compose test: From b863bf4f1f75f4104a37f4e07ded7cda2e577f0f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 29 Jun 2017 06:32:30 +0000 Subject: [PATCH 05/10] push to docker hub from circle ci --- circle.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/circle.yml b/circle.yml index b0b8a79a..bbbce51e 100644 --- a/circle.yml +++ b/circle.yml @@ -12,3 +12,14 @@ test: override: - docker-compose up -d - docker-compose run dockerapp python test.py + +deployment: + hub: + branch: [circle_ci_publish, master] + 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 + From 990305dc64eacbc413561379e5edbda843489ec6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Jun 2017 05:47:58 +0000 Subject: [PATCH 06/10] fixed the tab issue --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index bbbce51e..2b9acda5 100644 --- a/circle.yml +++ b/circle.yml @@ -22,4 +22,3 @@ deployment: - 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 749eef396ccc36b93851dbf5e78fc320224ea3fb Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Jun 2017 06:07:33 +0000 Subject: [PATCH 07/10] removed version from docker compose --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ca8326e1..f3f673e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: dockerapp: build: . From 77c67bd8d43d56feca2e13c149d1b3df8b5c3c65 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 2 Jul 2017 17:42:25 +0000 Subject: [PATCH 08/10] changed the docker compose version --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index f3f673e3..ca8326e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +version: '2' services: dockerapp: build: . From c02a6226772e0b59492b83bad5561c9781dacc97 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Jul 2017 11:13:03 +0000 Subject: [PATCH 09/10] changed circel.yml to fix the docker compose error --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 37709910..48b687b6 100644 --- a/circle.yml +++ b/circle.yml @@ -16,7 +16,7 @@ test: deployment: hub: - branch: /.*/ + branch: [circle_ci_publish, master] 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 From f288cfedf272621ecd6ca1096a4f700c1c021477 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Jul 2017 11:24:19 +0000 Subject: [PATCH 10/10] Docker compose errir fixed --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 7f0fb7bb..48b687b6 100644 --- a/circle.yml +++ b/circle.yml @@ -16,7 +16,6 @@ test: deployment: hub: -<<<<<<< HEAD branch: [circle_ci_publish, master] commands: - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD