Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: itsrohit/dockerapp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jleetutorial/dockerapp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Aug 4, 2017

  1. upgrade to dc v3 and add depends_on

    James Lee committed Aug 4, 2017
    Copy the full SHA
    9ffed2a View commit details
  2. Merge branch 'branch-v0.4' into branch-v0.5

    James Lee committed Aug 4, 2017
    Copy the full SHA
    13311df View commit details
  3. Merge branch 'branch-v0.5' into branch-v0.6

    James Lee committed Aug 4, 2017
    Copy the full SHA
    d76f5de View commit details

Commits on Aug 5, 2017

  1. use dc 1.9

    James Lee committed Aug 5, 2017
    Copy the full SHA
    1b77f08 View commit details
  2. upgrade docker version on circle

    James Lee committed Aug 5, 2017
    Copy the full SHA
    c9e1f9c View commit details
  3. specify dc 3.0

    James Lee committed Aug 5, 2017
    Copy the full SHA
    11d762a View commit details
  4. up dc

    James Lee committed Aug 5, 2017
    Copy the full SHA
    f4f5362 View commit details
  5. remove volumn

    James Lee committed Aug 5, 2017
    Copy the full SHA
    e312219 View commit details
  6. Merge branch 'branch-v0.4' into branch-v0.5

    James Lee committed Aug 5, 2017
    Copy the full SHA
    2e0bb84 View commit details
  7. Merge branch 'branch-v0.5' into branch-v0.6

    James Lee committed Aug 5, 2017
    Copy the full SHA
    1d4ae44 View commit details
  8. upgrade to CI 2

    James Lee committed Aug 5, 2017
    Copy the full SHA
    728cc02 View commit details
  9. clean up

    James Lee committed Aug 5, 2017
    Copy the full SHA
    a73e6a0 View commit details
  10. Merge branch 'branch-v0.6' into branch-v0.7

    James Lee committed Aug 5, 2017
    Copy the full SHA
    89e4fac View commit details
  11. add deployment

    James Lee committed Aug 5, 2017
    Copy the full SHA
    cf4eca1 View commit details
  12. Merge branch 'branch-v0.7' into branch-v0.8

    James Lee committed Aug 5, 2017
    Copy the full SHA
    7718e62 View commit details
  13. Merge branch 'branch-v0.8' into branch-v0.9

    James Lee committed Aug 5, 2017
    Copy the full SHA
    32ebe66 View commit details

Commits on Aug 6, 2017

  1. add depends_on to prod compose file

    James Lee committed Aug 6, 2017
    Copy the full SHA
    0d0c236 View commit details
  2. upgrade to dc3

    James Lee committed Aug 6, 2017
    Copy the full SHA
    2cce709 View commit details

Commits on Aug 7, 2017

  1. reformatting

    James Lee committed Aug 7, 2017
    Copy the full SHA
    054eb8c View commit details
  2. Merge branch 'branch-v0.6' into branch-v0.7

    James Lee committed Aug 7, 2017
    Copy the full SHA
    4a1995c View commit details
  3. Merge branch 'branch-v0.7' into branch-v0.8

    James Lee committed Aug 7, 2017
    Copy the full SHA
    a6b7193 View commit details
  4. Merge branch 'branch-v0.8' into branch-v0.9

    James Lee committed Aug 7, 2017
    Copy the full SHA
    3202be2 View commit details

Commits on Sep 26, 2017

  1. Create prod.yml

    jleetutorial authored Sep 26, 2017
    Copy the full SHA
    4d9fc83 View commit details

Commits on Oct 21, 2017

  1. add replicas to deploy

    James Lee committed Oct 21, 2017
    Copy the full SHA
    5017fce View commit details
  2. Create README.md

    jleetutorial authored Oct 21, 2017
    Copy the full SHA
    3878af4 View commit details

Commits on Oct 26, 2017

  1. Update README.md

    jleetutorial authored Oct 26, 2017
    Copy the full SHA
    12b7340 View commit details

Commits on Nov 18, 2017

  1. Update README.md

    jleetutorial authored Nov 18, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0fb3056 View commit details
Showing with 39 additions and 28 deletions.
  1. +27 −0 .circleci/config.yml
  2. +6 −0 README.md
  3. +0 −24 circle.yml
  4. +3 −2 docker-compose.yml
  5. +3 −2 prod.yml
27 changes: 27 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
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.15.0
- run:
name: Run tests
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# dockerapp
Project source code for James Lee's Docker course.

Check out our latest DevOps PDF book.

https://www.level-up.one/devops-pdf-book/
24 changes: 0 additions & 24 deletions circle.yml

This file was deleted.

5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
version: '2'
version: "3.0"
services:
dockerapp:
build: .
ports:
- "5000:5000"

depends_on:
- redis
redis:
image: redis:3.2.0
5 changes: 3 additions & 2 deletions prod.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
version: '2'
version: "3.0"
services:
dockerapp:
image: jleetutorial/dockerapp
ports:
- "5000:5000"

depends_on:
- redis
redis:
image: redis:3.2.0