Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Integrating helion-ui-framework #2

Merged
merged 1 commit into from
Jan 7, 2016
Merged

Integrating helion-ui-framework #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
npm-debug.log
node_modules
dist
lib
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
14 changes: 12 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
4 changes: 2 additions & 2 deletions provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<!-- inject:js -->
<!-- endinject -->
</head>
<body ng-app="my-webapp" app>
<body ng-app="green-box-ui" app>
</body>
</html>
3 changes: 2 additions & 1 deletion src/index.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
];

var otherModules = [
'helion.framework'
];

angular
.module('my-webapp', [
.module('green-box-ui', [
'app'
]
.concat(angularModules)
Expand Down
1 change: 1 addition & 0 deletions src/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@import "lib/helion-ui-framework/framework";
@import "app/app";
18 changes: 12 additions & 6 deletions tools/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
];


Expand All @@ -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'
Expand All @@ -50,8 +50,6 @@ var cssFiles = [


var partials = [
paths.src + 'lib/**/*.html',
paths.src + 'framework/**/*.html',
paths.src + 'app/**/*.html'
];

Expand All @@ -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')
Expand Down Expand Up @@ -111,6 +116,7 @@ gulp.task('default', function (next) {
'js',
'css',
'html',
'lib',
'index:copy',
'index:inject',
next
Expand Down