Skip to content

Commit 6ae4862

Browse files
JeremyMarshallJeremyMarshall
committed
3.7.5
1 parent 038b3e1 commit 6ae4862

File tree

6 files changed

+214
-54
lines changed

6 files changed

+214
-54
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.bak

‎Dockerfile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
FROM node:4.2.4
22

3-
MAINTAINER Jeremystuartmarshall
3+
MAINTAINER Jeremymarshall
44

5-
LABEL "version"="3.3.0"
5+
LABEL "version"="3.7.5"
66

7-
RUN npm cache clean -f
8-
RUN npm install -g npm
9-
RUN npm install -g yo
7+
RUN npm cache clean -f; npm install -g npm; npm install -g yo
108

119
RUN mkdir -p /usr/src/app
1210
WORKDIR /usr/src/app
1311

1412
ENV NODE_PATH=/usr/local/lib/node_modules/:/usr/local/lib NODE_ENV=production
1513

16-
COPY package.json /usr/src/app/
14+
COPY *.json /usr/src/app/
1715
RUN npm install
1816

1917
ONBUILD COPY package.json /usr/src/app/

‎README.md‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,33 @@
1-
# angular-fullstack-dockerfile
1+
# angular-fullstack-dockerfile
2+
3+
This is the Docker image for the node.js yeoman generator angular-fullstack.
4+
5+
As the generator requires node and several npm modules this image bakes in the dependencies to reduce the time taken to deploy applications.
6+
7+
## Construction
8+
9+
This image uses the standard node.js 4.2.2 image.
10+
11+
It is tied into the docker hub and will automatically include upstream changes.
12+
13+
## Usage
14+
15+
**waiting for inclusion**
16+
17+
You will be able to do
18+
19+
yo angular-fullstack:docker
20+
21+
Which will add the Dockerfile to your dist folder
22+
23+
This can then be built using the standard docker tools
24+
25+
The Dockerfile will survive
26+
27+
grunt clean
28+
29+
operations
30+
31+
## Tracking
32+
33+
As angular-fullstack evolves and npm references change this repo will track the version numbers and create a new branch which will then create a new docker container per branch

‎create_branch.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bash -x
2+
3+
#find the generator-angular-fullstack source
4+
#this is usually 2 direcories up as this is a submodule
5+
#but use your own if you want to
6+
FULLSTACK_DIR=${DEFAULT_FULLSTACK_DIR:='../..'}
7+
8+
echo "Using ${FULLSTACK_DIR} to create branch"
9+
10+
ver=$(grep version ${FULLSTACK_DIR}/package.json |cut -f2 -d:|sed -e 's/"//g; s/,//; s/ //g')
11+
12+
echo "attempting to checkout ${ver} branch"
13+
git checkout ${ver}
14+
if [ $? != 0 ]; then
15+
echo "attempting to create ${ver} branch from master"
16+
git pull origin master
17+
git checkout -b ${ver} master
18+
if [ $? != 0 ]; then
19+
echo "failed to create branch, exitting"
20+
exit 99
21+
fi
22+
fi
23+
24+
echo "building package.json, typings.json and Dockerfile"
25+
sed -e 's/<%.*%>//; /name/d' ${FULLSTACK_DIR}/templates/app/_package.json > package.json
26+
sed -e 's/<%.*%>//; /name/d' "${FULLSTACK_DIR}/templates/app/typings(ts).json" > typings.json
27+
28+
sed -i .bak "s/LABEL.*/LABEL \"version\"=\"${ver}\"/" Dockerfile
29+
sed -i .bak "s/\"version\".*/\"version\": \"${ver}\",/" package.json

‎package.json‎

Lines changed: 126 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,188 @@
11
{
2-
"name": "generator-angular-fullstack",
3-
"version": "3.3.0-beta.0",
2+
"version": "3.7.5",
43
"main": "server/app.js",
54
"dependencies": {
65
"express": "^4.13.3",
7-
"morgan": "~1.6.1",
6+
"morgan": "~1.7.0",
87
"body-parser": "^1.13.3",
98
"method-override": "^2.3.5",
109
"cookie-parser": "^1.3.5",
1110
"express-session": "^1.11.3",
1211
"errorhandler": "^1.4.2",
1312
"compression": "^1.5.2",
1413
"composable-middleware": "^0.3.0",
15-
"lodash": "^3.10.1",
14+
"lodash": "^4.6.1",
1615
"lusca": "^1.3.0",
17-
"babel-runtime": "^5.8.20",
16+
"babel-runtime": "^6.6.1",
17+
"babel-polyfill": "^6.7.2",
1818
"jade": "^1.11.0",
19+
"ejs": "^2.3.3",
1920
"mongoose": "^4.1.2",
20-
"bluebird": "^2.9.34",
21-
"connect-mongo": "^0.8.1",
22-
"jsonwebtoken": "^5.0.0",
21+
"bluebird": "^3.3.3",
22+
"connect-mongo": "^1.1.0",
23+
"sequelize": "^3.5.1",
24+
"sqlite3": "~3.1.1",
25+
"express-sequelize-session": "0.4.0",
26+
"jsonwebtoken": "^7.0.0",
2327
"express-jwt": "^3.0.0",
2428
"passport": "~0.3.0",
2529
"passport-local": "^1.0.0",
30+
"passport-facebook": "^2.0.0",
31+
"passport-twitter": "^1.0.3",
32+
"passport-google-oauth20": "^1.0.0",
2633
"socket.io": "^1.3.5",
2734
"socket.io-client": "^1.3.5",
2835
"socketio-jwt": "^4.2.0",
2936
"serve-favicon": "^2.3.0"
3037
},
3138
"devDependencies": {
3239
"autoprefixer": "^6.0.0",
33-
"babel-core": "^5.6.4",
34-
"grunt": "~0.4.5",
40+
"babel-core": "^6.6.5",
41+
"babel-register": "^6.6.5",
42+
"babel-plugin-transform-class-properties": "^6.6.0",
43+
"babel-plugin-transform-runtime": "^6.6.0",
44+
"babel-preset-es2015": "^6.6.0",
45+
"del": "^2.0.2",
46+
"gulp": "^3.9.1",
47+
"gulp-add-src": "^0.2.0",
48+
"gulp-angular-templatecache": "^1.7.0",
49+
"gulp-autoprefixer": "^3.1.0",
50+
"gulp-babel": "^6.1.2",
51+
"gulp-typescript": "~2.13.0",
52+
"gulp-typings": "^1.3.6",
53+
"gulp-tslint": "^5.0.0",
54+
"gulp-cache": "^0.4.2",
55+
"gulp-concat": "^2.6.0",
56+
"gulp-env": "^0.4.0",
57+
"gulp-filter": "^4.0.0",
58+
"gulp-imagemin": "^2.2.1",
59+
"gulp-inject": "^4.0.0",
60+
"gulp-istanbul": "~0.10.3",
61+
"gulp-istanbul-enforcer": "^1.0.3",
62+
"gulp-jscs": "^3.0.2",
63+
"gulp-jshint": "^2.0.0",
64+
"jshint": "2.9.2",
65+
"gulp-livereload": "^3.8.0",
66+
"gulp-load-plugins": "^1.0.0-rc.1",
67+
"gulp-clean-css": "^2.0.6",
68+
"gulp-mocha": "^2.1.3",
69+
"gulp-ng-annotate": "^2.0.0",
70+
"gulp-ng-constant": "^1.1.0",
71+
"gulp-node-inspector": "^0.1.0",
72+
"gulp-plumber": "^1.0.1",
73+
"gulp-protractor": "^2.1.0",
74+
"gulp-rev": "^7.0.0",
75+
"gulp-rev-replace": "^0.4.2",
76+
"gulp-sort": "^2.0.0",
77+
"gulp-sourcemaps": "^1.5.2",
78+
"gulp-svgmin": "^1.1.2",
79+
"gulp-uglify": "^1.2.0",
80+
"gulp-useref": "^3.0.3",
81+
"gulp-util": "^3.0.5",
82+
"gulp-watch": "^4.3.5",
83+
"gulp-jade": "^1.0.1",
84+
"gulp-stylus": "^2.0.4",
85+
"gulp-stylint": "^3.0.0",
86+
"nib": "^1.1.0",
87+
"gulp-sass": "^2.2.0",
88+
"gulp-scss-lint": "^0.3.9",
89+
"gulp-less": "^3.0.3",
90+
"gulp-recess": "^1.1.2",
91+
"grunt": "^1.0.1",
92+
"grunt-build-control": "^0.7.0",
93+
"isparta": "^4.0.0",
94+
"utile": "~0.3.0",
95+
"nodemon": "^1.3.7",
96+
"run-sequence": "^1.1.0",
97+
"lazypipe": "^1.0.1",
98+
"wiredep": "^2.2.2",
99+
"grunt": "^0.4.5",
35100
"grunt-wiredep": "^2.0.0",
36101
"grunt-concurrent": "^2.0.1",
37-
"grunt-contrib-clean": "~0.7.0",
38-
"grunt-contrib-concat": "^0.5.1",
39-
"grunt-contrib-copy": "^0.8.0",
40-
"grunt-contrib-cssmin": "~0.14.0",
41-
"grunt-contrib-imagemin": "~1.0.0",
42-
"grunt-contrib-jshint": "~0.11.2",
43-
"grunt-contrib-uglify": "~0.11.0",
44-
"grunt-contrib-watch": "~0.6.1",
45-
"grunt-contrib-jade": "^0.15.0",
46-
"grunt-babel": "~5.0.0",
102+
"grunt-contrib-clean": "^1.0.0",
103+
"grunt-contrib-concat": "^1.0.0",
104+
"grunt-contrib-copy": "^1.0.0",
105+
"grunt-contrib-cssmin": "^1.0.0",
106+
"grunt-contrib-imagemin": "^1.0.0",
107+
"grunt-contrib-jshint": "^1.0.0",
108+
"grunt-contrib-uglify": "^1.0.0",
109+
"grunt-contrib-watch": "^1.0.0",
110+
"grunt-contrib-jade": "^1.0.0",
111+
"grunt-contrib-less": "^1.2.0",
112+
"grunt-babel": "~6.0.0",
113+
"grunt-ts": "^5.3.2",
114+
"grunt-typings": "~0.1.4",
115+
"grunt-tslint": "~3.1.0",
47116
"grunt-google-cdn": "~0.4.0",
48117
"grunt-jscs": "^2.1.0",
49118
"grunt-newer": "^1.1.1",
50-
"grunt-ng-annotate": "^1.0.1",
51-
"grunt-ng-constant": "^1.1.0",
119+
"grunt-ng-annotate": "^2.0.1",
120+
"grunt-ng-constant": "^2.0.1",
52121
"grunt-filerev": "^2.3.1",
53122
"grunt-usemin": "^3.0.0",
54123
"grunt-env": "~0.4.1",
55124
"grunt-node-inspector": "^0.4.1",
56125
"grunt-nodemon": "^0.4.0",
57-
"grunt-angular-templates": "^0.5.4",
126+
"grunt-angular-templates": "^1.0.3",
58127
"grunt-dom-munger": "^3.4.0",
59-
"grunt-protractor-runner": "^2.0.0",
60-
"grunt-injector": "^0.6.0",
61-
"grunt-karma": "~0.12.0",
62-
"grunt-build-control": "^0.6.0",
63-
"grunt-contrib-sass": "^0.9.0",
64-
"jit-grunt": "^0.9.1",
128+
"grunt-protractor-runner": "^3.1.0",
129+
"grunt-injector": "~0.6.0 ",
130+
"grunt-karma": "^1.0.0",
131+
"grunt-build-control": "^0.7.0",
132+
"grunt-sass": "^1.1.0",
133+
"grunt-contrib-stylus": "^1.2.0",
134+
"jit-grunt": "~0.10.0",
65135
"grunt-express-server": "^0.5.1",
66-
"grunt-postcss": "~0.7.1",
136+
"grunt-postcss": "~0.8.0",
67137
"grunt-open": "~0.2.3",
68138
"time-grunt": "^1.2.1",
69139
"grunt-mocha-test": "~0.12.7",
70-
"grunt-mocha-istanbul": "^3.0.1",
140+
"grunt-mocha-istanbul": "^4.0.2",
71141
"open": "~0.0.4",
72-
"jshint-stylish": "~2.1.0",
142+
"jshint-stylish": "^2.2.0",
73143
"connect-livereload": "^0.5.3",
74144
"istanbul": "~0.4.1",
75145
"chai": "^3.2.0",
76146
"sinon": "^1.16.1",
77147
"chai-as-promised": "^5.1.0",
78148
"chai-things": "^0.2.0",
79149
"karma": "~0.13.3",
80-
"karma-ng-scenario": "~0.1.0",
81-
"karma-firefox-launcher": "~0.1.6",
82-
"karma-script-launcher": "~0.1.0",
83-
"karma-chrome-launcher": "~0.2.0",
84-
"karma-requirejs": "~0.2.2",
150+
"karma-firefox-launcher": "^1.0.0",
151+
"karma-script-launcher": "^1.0.0",
152+
"karma-chrome-launcher": "^1.0.1",
85153
"karma-jade-preprocessor": "0.0.11",
86-
"karma-phantomjs-launcher": "~0.2.0",
154+
"karma-phantomjs-launcher": "~1.0.0",
87155
"karma-ng-jade2js-preprocessor": "^0.2.0",
156+
"karma-ng-html2js-preprocessor": "^1.0.0",
88157
"karma-spec-reporter": "~0.0.20",
89158
"sinon-chai": "^2.8.0",
159+
"mocha": "^2.2.5",
160+
"karma-mocha": "^1.0.1",
161+
"karma-chai-plugins": "~0.7.0",
90162
"jasmine-core": "^2.3.4",
91-
"karma-jasmine": "~0.3.0",
163+
"karma-jasmine": "^1.0.2",
92164
"jasmine-spec-reporter": "^2.4.0",
93-
"karma-babel-preprocessor": "^5.2.1",
94-
"requirejs": "~2.1.11",
95-
"phantomjs": "^1.9.18",
165+
"karma-babel-preprocessor": "^6.0.1",
166+
"phantomjs-prebuilt": "^2.1.4",
96167
"proxyquire": "^1.0.1",
97-
"supertest": "^1.1.0"
168+
"supertest": "^1.1.0",
169+
"tslint": "^3.5.0",
170+
"typings": "^0.8.1"
98171
},
99172
"engines": {
100-
"node": "^4.2.3",
101-
"npm": "^2.14.7"
173+
"node": "^4.4.0",
174+
"npm": "^2.14.20"
102175
},
103176
"scripts": {
104-
"start": "node server",
177+
"test": "gulp test",
105178
"test": "grunt test",
106-
"update-webdriver": "node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
179+
180+
"postinstall": "./node_modules/.bin/typings install",
181+
182+
"update-webdriver": "node node_modules/protractor/bin/webdriver-manager update",
183+
184+
"update-webdriver": "node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update",
185+
"start": "node server"
107186
},
108187
"private": true
109188
}

‎typings.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"ambientDependencies": {
3+
"angular": "registry:dt/angular#1.5.0+20160412133217",
4+
"jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
5+
"lodash": "github:DefinitelyTyped/DefinitelyTyped/lodash/lodash.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
6+
"socket.io-client": "github:DefinitelyTyped/DefinitelyTyped/socket.io-client/socket.io-client.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"
7+
},
8+
"ambientDevDependencies": {
9+
"angular-protractor": "github:DefinitelyTyped/DefinitelyTyped/angular-protractor/angular-protractor.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
10+
"selenium-webdriver": "github:DefinitelyTyped/DefinitelyTyped/selenium-webdriver/selenium-webdriver.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
11+
12+
"mocha": "github:DefinitelyTyped/DefinitelyTyped/mocha/mocha.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
13+
"chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
14+
"assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
15+
"sinon": "github:DefinitelyTyped/DefinitelyTyped/sinon/sinon.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
16+
"sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
17+
18+
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
19+
"selenium-webdriver": "github:DefinitelyTyped/DefinitelyTyped/selenium-webdriver/selenium-webdriver.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"
20+
}
21+
}

0 commit comments

Comments
 (0)