diff --git a/.gitignore b/.gitignore index f71f11374e..20d3e2defc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ npm-debug.log node_modules dist +lib diff --git a/Dockerfile b/Dockerfile index cecb8c79c4..b21d16db4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,4 @@ FROM node:4.2.3 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -CMD [ "/bin/bash", "provision.sh" ] +CMD [ "/bin/bash" ] diff --git a/README.md b/README.md index 747cba1543..491dba532b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,17 @@ docker build -t stratos-ui . ``` -## Run docker container +## Create and start docker container ``` -docker run -it --name stratos-ui -v $(pwd):/usr/src/app stratos-ui +docker run -it --rm --name stratos-ui -v $(pwd):/usr/src/app -v $(pwd)/../helion-ui-framework:/usr/src/helion-ui-framework stratos-ui /bin/bash +``` + +## provision container +``` +docker exec -d stratos-ui /bin/bash provision.sh +``` + +## ssh into the running container +``` +docker exec -it stratos-ui /bin/bash ``` diff --git a/provision.sh b/provision.sh index 924bd8669c..3f07b081d6 100644 --- a/provision.sh +++ b/provision.sh @@ -6,5 +6,5 @@ TOOLS_DIR="$WORK_DIR/tools" cd $TOOLS_DIR npm install PATH=$PATH:$TOOLS_DIR/node_modules/.bin -bower install --allow-root -gulp +node_modules/.bin/bower install --allow-root --force +node_modules/.bin/gulp diff --git a/src/index.html b/src/index.html index de51a4514a..b9701273a0 100644 --- a/src/index.html +++ b/src/index.html @@ -9,6 +9,6 @@ - + diff --git a/src/index.module.js b/src/index.module.js index 4f11e924cd..1f765529a5 100644 --- a/src/index.module.js +++ b/src/index.module.js @@ -5,10 +5,11 @@ ]; var otherModules = [ + 'helion.framework' ]; angular - .module('my-webapp', [ + .module('green-box-ui', [ 'app' ] .concat(angularModules) diff --git a/src/index.scss b/src/index.scss index 83e44b62f2..4883a0924e 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1 +1,2 @@ +@import "lib/helion-ui-framework/framework"; @import "app/app"; diff --git a/tools/gulpfile.js b/tools/gulpfile.js index 480f8c9be4..c652a35eb0 100644 --- a/tools/gulpfile.js +++ b/tools/gulpfile.js @@ -15,12 +15,14 @@ var paths = { var jsSourceFiles = [ - paths.src + '**/*.js', + paths.src + '**/*.js' ]; var jsLibs = [ - paths.dist + 'lib/angular/angular.js' + paths.dist + 'lib/angular/angular.js', + paths.dist + 'lib/helion-ui-framework/**/*.module.js', + paths.dist + 'lib/helion-ui-framework/**/*.js' ]; @@ -30,9 +32,7 @@ var plugins = [ var jsFiles = [ paths.dist + 'index.module.js', - paths.dist + 'framework/**/*.module.js', paths.dist + 'app/**/*.module.js', - paths.dist + 'framework/**/*.js', paths.dist + 'app/**/*.js', '!' + paths.dist + '**/*.mock.js', '!' + paths.dist + '**/*.spec.js' @@ -50,8 +50,6 @@ var cssFiles = [ var partials = [ - paths.src + 'lib/**/*.html', - paths.src + 'framework/**/*.html', paths.src + 'app/**/*.html' ]; @@ -78,6 +76,13 @@ gulp.task('html', function () { }); +gulp.task('lib', function () { + return gulp + .src(paths.src + 'lib/**') + .pipe(gulp.dest(paths.dist + 'lib/')); +}); + + gulp.task('index:copy', function () { return gulp .src(paths.src + 'index.html') @@ -111,6 +116,7 @@ gulp.task('default', function (next) { 'js', 'css', 'html', + 'lib', 'index:copy', 'index:inject', next