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: jleetutorial/dockerapp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: itsrohit/dockerapp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 5 files changed
  • 3 contributors

Commits on Jun 26, 2016

  1. refactor docker compose file

    James Lee committed Jun 26, 2016
    Copy the full SHA
    306b9e9 View commit details

Commits on Jun 27, 2016

  1. update docker compose file for docker swarm

    James Lee committed Jun 27, 2016
    Copy the full SHA
    8bddaa6 View commit details

Commits on Dec 28, 2016

  1. Create README.md

    @jleetutorial
    jleetutorial authored Dec 28, 2016
    Copy the full SHA
    e6f0a7a View commit details

Commits on May 13, 2017

  1. fixed outdated docker-compose version

    U-TSI-PA\rprabhu authored and U-TSI-PA\rprabhu committed May 13, 2017
    Copy the full SHA
    60fc8ee View commit details

  2. updated dockerhub env vars

    U-TSI-PA\rprabhu authored and U-TSI-PA\rprabhu committed May 13, 2017
    Copy the full SHA
    cf63e0f View commit details

  3. fixed outdated docker-compose version

    U-TSI-PA\rprabhu authored and U-TSI-PA\rprabhu committed May 13, 2017
    Copy the full SHA
    6e883f3 View commit details
Showing with 39 additions and 11 deletions.
  1. +2 −0 README.md
  2. +6 −5 circle.yml
  3. +7 −0 common.yml
  4. +6 −3 docker-compose.yml
  5. +18 −3 prod.yml
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# dockerapp
Project source code for https://www.udemy.com/docker-tutorial-for-devops-run-docker-containers
11 changes: 6 additions & 5 deletions circle.yml
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ machine:

dependencies:
pre:
- sudo pip install --upgrade pip
- sudo pip install docker-compose

test:
@@ -17,8 +18,8 @@ deployment:
hub:
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 login -e $DOCKERHUB_EMAIL -u $DOCKERHUB_ID -p $DOCKERHUB_PWD
- docker tag dockerapp_dockerapp $DOCKERHUB_ID/dockerapp:$CIRCLE_SHA1
- docker tag dockerapp_dockerapp $DOCKERHUB_ID/dockerapp:latest
- docker push $DOCKERHUB_ID/dockerapp:$CIRCLE_SHA1
- docker push $DOCKERHUB_ID/dockerapp:latest
7 changes: 7 additions & 0 deletions common.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: '2'
services:
dockerapp:
ports:
- "5000:5000"
redis:
image: redis:3.2.0
9 changes: 6 additions & 3 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -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
21 changes: 18 additions & 3 deletions prod.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
version: '2'
services:
dockerapp:
extends:
file: common.yml
service: dockerapp
image: jleetutorial/dockerapp
ports:
- "5000:5000"
environment:
- constraint:node==master
depends_on:
- redis
networks:
- mynet

redis:
image: redis:3.2.0
extends:
file: common.yml
service: redis
networks:
- mynet

networks:
mynet:
driver: overlay