From cb7bfe63a800a21a87c851d6127795d8d411c8d7 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 26 Jun 2016 14:46:49 +0100 Subject: [PATCH 1/8] 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 2/8] 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 0d0c23605949d2e4cf299945b1a595e2a9450722 Mon Sep 17 00:00:00 2001 From: James Lee Date: Sun, 6 Aug 2017 12:56:21 +0100 Subject: [PATCH 3/8] 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 4/8] 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 4d9fc8304805688dcea1de08282d2aef77be3f49 Mon Sep 17 00:00:00 2001 From: James Lee Date: Tue, 26 Sep 2017 17:57:09 +0100 Subject: [PATCH 5/8] 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 6/8] 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 7/8] 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 8/8] 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/