Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c2327a7
Merge pull request #1 from mjhea0/test
mjhea0 Mar 6, 2015
ed7f1d2
Merge pull request #3 from mjhea0/test
mjhea0 Mar 6, 2015
9e3f977
updatedt readme
mjhea0 Mar 7, 2015
eab704a
updatedt readme
mjhea0 Mar 7, 2015
837cc5b
fix redis client argument order
dciccale Apr 5, 2015
6015d87
updated
mjhea0 Apr 5, 2015
a304b2f
Merge pull request #4 from dciccale/patch-1
mjhea0 Apr 5, 2015
a5d7579
updated redis tcp address
mjhea0 Apr 5, 2015
275b22a
updated dockerfile
mjhea0 May 13, 2015
135eb40
base
mjhea0 May 13, 2015
682621b
added docker compose
mjhea0 May 13, 2015
c1171f3
Added circle.yml file
mjhea0 May 13, 2015
b4b80c1
Added circle.yml file
mjhea0 May 13, 2015
ff39708
updates
mjhea0 May 13, 2015
f2c0e02
new base init
mjhea0 Oct 18, 2015
45bdd80
new base init
mjhea0 Oct 18, 2015
030391f
updated package.json
mjhea0 Oct 18, 2015
1554c72
Merge pull request #7 from mjhea0/base2
mjhea0 Oct 18, 2015
4a1f7dd
added docker-compose
mjhea0 Oct 18, 2015
5058091
circle.yml
mjhea0 Oct 18, 2015
ee97105
circle.yml
mjhea0 Oct 18, 2015
54c9b00
circle.yml
mjhea0 Oct 18, 2015
1fca5e5
circle.yml
mjhea0 Oct 18, 2015
662f067
circle.yml
mjhea0 Oct 18, 2015
ad013bb
circle.yml
mjhea0 Oct 18, 2015
b82da72
updated yaml
mjhea0 Oct 18, 2015
1f9c876
Merge pull request #8 from mjhea0/circle-test
mjhea0 Oct 18, 2015
6a6d22f
readme created
amerriman Oct 18, 2015
7af0d30
Merge pull request #1 from amerriman/test
amerriman Oct 18, 2015
289f5bc
update readme
amerriman Oct 18, 2015
2eea17e
Merge pull request #2 from amerriman/master
amerriman Oct 18, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.DS_Store
npm-debug.log
node_modules
blog.md
_presentation
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sample
Binary file removed _presentation/images/circleci.png
Binary file not shown.
Binary file removed _presentation/images/compose.jpg
Binary file not shown.
Binary file removed _presentation/images/compose.png
Binary file not shown.
Binary file removed _presentation/images/docker-logo.jpg
Binary file not shown.
Binary file removed _presentation/images/fig.png
Binary file not shown.
Binary file removed _presentation/images/figup.png
Binary file not shown.
Binary file removed _presentation/images/heart.jpg
Binary file not shown.
Binary file removed _presentation/images/holy-grail.jpg
Binary file not shown.
Binary file removed _presentation/images/logo.png
Binary file not shown.
Binary file removed _presentation/images/oh-my.jpg
Binary file not shown.
Binary file removed _presentation/images/rp_logo_color_small.png
Binary file not shown.
Binary file removed _presentation/images/steps.jpg
Binary file not shown.
Binary file removed _presentation/images/tutum.jpg
Binary file not shown.
Binary file removed _presentation/images/tutum.png
Binary file not shown.
226 changes: 0 additions & 226 deletions _presentation/presentation.md

This file was deleted.

2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dockerfile/nodejs
FROM node:latest

RUN mkdir /src

Expand Down
6 changes: 3 additions & 3 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ var express = require('express'),
var app = express();

var client = redis.createClient(
process.env.REDIS_1_PORT_6379_TCP_PORT || '127.0.01',
process.env.REDIS_1_PORT_6379_TCP_ADDR || 6379
process.env.REDIS_1_PORT_6379_TCP_PORT || 6379,
process.env.REDIS_1_PORT_6379_TCP_ADDR || '127.0.0.1'
);

app.get('/', function(req, res, next) {
Expand All @@ -18,4 +18,4 @@ app.get('/', function(req, res, next) {

http.createServer(app).listen(process.env.PORT || 3000, function() {
console.log('Listening on port ' + (process.env.PORT || 3000));
});
});
8 changes: 4 additions & 4 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "node-docker-workflow",
"version": "0.0.1",
"version": "0.0.2",
"private": true,
"scripts": {
"start": "node index.js"
},
"dependencies": {
"express": "3.4.8",
"mocha": "^2.1.0",
"redis": "^0.12.1"
"express": "^4.13.3",
"mocha": "^2.3.3",
"redis": "^2.2.5"
}
}
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ machine:

dependencies:
override:
- sudo pip install docker-compose
- sudo pip install --upgrade docker-compose==1.3.3

test:
override:
Expand All @@ -15,4 +15,4 @@ deployment:
hub:
branch: master
commands:
- $DEPLOY
- $DEPLOY
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
web:
build: ./app
volumes:
- "app:/src/app"
- "./app:/src/app"
ports:
- "80:3000"
links:
- redis
redis:
build: ./redis
image: redis:latest
ports:
- "6379:6379"
3 changes: 0 additions & 3 deletions readme.md

This file was deleted.

37 changes: 0 additions & 37 deletions redis/Dockerfile

This file was deleted.

32 changes: 0 additions & 32 deletions test_tutum.yml

This file was deleted.

Loading