From b088d2e609c0aa3d6810ce60a913ad9c03806410 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 14:34:02 +0100 Subject: [PATCH 01/18] initial commit for circle ci yaml --- circle.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..b0b8a79a --- /dev/null +++ b/circle.yml @@ -0,0 +1,14 @@ +machine: + pre: + - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0 + services: + - docker + +dependencies: + pre: + - sudo pip install docker-compose + +test: + override: + - docker-compose up -d + - docker-compose run dockerapp python test.py From 8cfc5d42a6ff66e7ae743660a1526c75baa82e43 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 14:40:58 +0100 Subject: [PATCH 02/18] push docker image to docker hub from circleCI --- circle.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/circle.yml b/circle.yml index b0b8a79a..6abec304 100644 --- a/circle.yml +++ b/circle.yml @@ -12,3 +12,13 @@ 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 cb7bfe63a800a21a87c851d6127795d8d411c8d7 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 14:46:49 +0100 Subject: [PATCH 03/18] update deployment branch and remove volumn --- Dockerfile | 1 + circle.yml | 2 +- docker-compose.yml | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ee8add0..bca0015a 100644 --- a/Dockerfile +++ b/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"] diff --git a/circle.yml b/circle.yml index 6abec304..700c79f9 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ test: deployment: hub: - branch: [circle_ci_publish, master] + 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 diff --git a/docker-compose.yml b/docker-compose.yml index ca8326e1..2c57eda6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: build: . ports: - "5000:5000" - volumes: - - ./app:/app redis: image: redis:3.2.0 From f668f22a295475b1ba9ec43a429b6dc728cec8d8 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 15:01:03 +0100 Subject: [PATCH 04/18] add docker compose file for production deployment --- prod.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 prod.yml diff --git a/prod.yml b/prod.yml new file mode 100644 index 00000000..b0096ff1 --- /dev/null +++ b/prod.yml @@ -0,0 +1,9 @@ +version: '2' +services: + dockerapp: + image: jleetutorial/dockerapp + ports: + - "5000:5000" + + redis: + image: redis:3.2.0 From 1b77f08fa11946059c5c168c4e6f0bd661e73179 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 01:01:25 +0100 Subject: [PATCH 05/18] use dc 1.9 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index b0b8a79a..2297b472 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 c9e1f9c80bd2db636a50b2bba543852d0f9d6a1f Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 01:12:35 +0100 Subject: [PATCH 06/18] upgrade docker version on circle --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 2297b472..9d7acdac 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: pre: - - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0 + - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.13.0 services: - docker From 11d762a0d723a66568895e7f0ffc98a1e8235c8a Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 01:15:19 +0100 Subject: [PATCH 07/18] specify dc 3.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 622f108c..dedf2343 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3.0" services: dockerapp: build: . From f4f53622b01d042ccc5fa2acca589c1c3319048b Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 11:13:06 +0100 Subject: [PATCH 08/18] up dc --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9d7acdac..f256dff6 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ machine: dependencies: pre: - - sudo pip install docker-compose==1.9.0 + - sudo pip install docker-compose==1.13.0 test: override: From 728cc021f0e1fb380f46ca5c56abc587e5663ad6 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 13:54:29 +0100 Subject: [PATCH 09/18] upgrade to CI 2 --- .circleci/config.yml | 22 ++++++++++++++++++++++ circle.yml | 14 -------------- 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..5d63d561 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,22 @@ +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.12.0 \ + awscli==1.11.76 + - run: + name: Run tests + command: | + docker-compose up -d + docker-compose run dockerapp python test.py diff --git a/circle.yml b/circle.yml deleted file mode 100644 index f256dff6..00000000 --- a/circle.yml +++ /dev/null @@ -1,14 +0,0 @@ -machine: - pre: - - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.13.0 - services: - - docker - -dependencies: - pre: - - sudo pip install docker-compose==1.13.0 - -test: - override: - - docker-compose up -d - - docker-compose run dockerapp python test.py From a73e6a031d04cf3d298da51f7c475c97e152e86c Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 13:57:27 +0100 Subject: [PATCH 10/18] clean up --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d63d561..28bd6ac5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,8 +13,7 @@ jobs: apk add --no-cache \ py-pip=9.0.0-r1 pip install \ - docker-compose==1.12.0 \ - awscli==1.11.76 + docker-compose==1.15.0 - run: name: Run tests command: | From cf4eca13610593a6439862f3b78ea8b31404077e Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 5 Aug 2017 14:16:02 +0100 Subject: [PATCH 11/18] add deployment --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28bd6ac5..ab5781e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,3 +19,11 @@ jobs: 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 From 0d0c23605949d2e4cf299945b1a595e2a9450722 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 6 Aug 2017 12:56:21 +0100 Subject: [PATCH 12/18] add depends_on to prod compose file --- prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prod.yml b/prod.yml index b0096ff1..455b585a 100644 --- a/prod.yml +++ b/prod.yml @@ -4,6 +4,8 @@ services: image: jleetutorial/dockerapp ports: - "5000:5000" + depends_on: + - redis redis: image: redis:3.2.0 From 2cce70934a4c3c40273000712270f1bebd1201bc Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 6 Aug 2017 13:13:05 +0100 Subject: [PATCH 13/18] upgrade to dc3 --- prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prod.yml b/prod.yml index 455b585a..e16b77d1 100644 --- a/prod.yml +++ b/prod.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3.0' services: dockerapp: image: jleetutorial/dockerapp From 054eb8c5915f4834901b3c7337eb792610c906cf Mon Sep 17 00:00:00 2001 From: James Lee Date: Mon, 7 Aug 2017 21:30:47 +0100 Subject: [PATCH 14/18] reformatting --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28bd6ac5..2440b829 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,10 +10,8 @@ jobs: - run: name: Install dependencies command: | - apk add --no-cache \ - py-pip=9.0.0-r1 - pip install \ - docker-compose==1.15.0 + apk add --no-cache py-pip=9.0.0-r1 + pip install docker-compose==1.15.0 - run: name: Run tests command: | From 4d9fc8304805688dcea1de08282d2aef77be3f49 Mon Sep 17 00:00:00 2001 From: James Lee Date: Tue, 26 Sep 2017 17:57:09 +0100 Subject: [PATCH 15/18] Create prod.yml --- prod.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 prod.yml diff --git a/prod.yml b/prod.yml new file mode 100644 index 00000000..cd964422 --- /dev/null +++ b/prod.yml @@ -0,0 +1,10 @@ +version: "3.0" +services: + dockerapp: + image: jleetutorial/dockerapp + ports: + - "5000:5000" + depends_on: + - redis + redis: + image: redis:3.2.0 From 3878af4d38ed087c9ceab02fcf6cf8242b3db03f Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 21 Oct 2017 18:06:05 +0100 Subject: [PATCH 16/18] Create README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..a15807ee --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# dockerapp +Project source code for James Lee's Spark course. + +Check out the full list of DevOps and Big Data courses that James and Tao teach. + +https://www.level-up.one/courses/ From 12b7340e5e2e0e8f8d7f724f2d7b0751450c95a2 Mon Sep 17 00:00:00 2001 From: James Lee Date: Thu, 26 Oct 2017 21:13:51 +0100 Subject: [PATCH 17/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a15807ee..25240bd0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # dockerapp -Project source code for James Lee's Spark course. +Project source code for James Lee's Docker course. Check out the full list of DevOps and Big Data courses that James and Tao teach. From 0fb3056f24ec1f2bbd14eac11200706dbdcb7e88 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sat, 18 Nov 2017 14:28:43 +0000 Subject: [PATCH 18/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25240bd0..fb38b881 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dockerapp Project source code for James Lee's Docker course. -Check out the full list of DevOps and Big Data courses that James and Tao teach. +Check out our latest DevOps PDF book. -https://www.level-up.one/courses/ +https://www.level-up.one/devops-pdf-book/