Skip to content

Commit cd4df0e

Browse files
committed
Switch to using checked in bindata.go for assets so console is always functional from a local build
1 parent 65614ef commit cd4df0e

File tree

6 files changed

+65
-65
lines changed

6 files changed

+65
-65
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist
33
.tmp
44
.sass-cache
55
bower_components
6+
Gemfile.lock

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'compass', '0.12.7'

Gruntfile.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,12 @@ module.exports = function (grunt) {
207207
filerev: {
208208
dist: {
209209
src: [
210-
'<%= yeoman.dist %>/scripts/{,*/}*.js',
211-
'<%= yeoman.dist %>/styles/{,*/}*.css',
212-
'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
213-
'<%= yeoman.dist %>/styles/fonts/*'
210+
// We do not need digest filenames as our files are loaded from
211+
// a commit-based path
212+
//'<%= yeoman.dist %>/scripts/{,*/}*.js',
213+
//'<%= yeoman.dist %>/styles/{,*/}*.css',
214+
//'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
215+
//'<%= yeoman.dist %>/styles/fonts/*'
214216
]
215217
}
216218
},

README.md

+9-19
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ Contributing
88
#### Getting started
99
1. Install [Nodejs](http://nodejs.org/) and [npm](https://www.npmjs.org/)
1010
2. Install [grunt-cli](http://gruntjs.com/installing-grunt) and [bower](http://bower.io/) by running `npm install -g grunt-cli bower` (may need to be run with sudo)
11-
3. From the `assets` directory, run the following commands:
12-
13-
`npm install` (Install the project's dev dependencies)
14-
15-
`bower install` (Install the project's UI dependencies)
16-
17-
`grunt serve` (Launch the console and start watching for asset changes)
11+
3. Install [ruby](https://www.ruby-lang.org/en/)
12+
4. Install bundler `gem install bundler`
13+
5. Install dev dependencies by running `hack/install-assets.sh`
14+
6. Launch the console and start watching for asset changes by running `hack/serve-local-assets.sh`
1815

1916
Note: If you see an ENOSPC error running `grunt serve`, you may need to increase the number of files your user can watch by running this command:
2017

@@ -23,19 +20,12 @@ Contributing
2320
```
2421
2522
#### Before opening a pull request
26-
1. Run the test suite with `grunt test`
23+
1. Run the test suite with `hack/test-assets.sh`
2724
2. Rebase and squash changes to a single commit
2825
2926
#### Production builds
30-
1. From the `assets` directory, run `grunt build`
31-
2. From the root of the origin repo, run:
32-
33-
```
34-
go get github.com/jteeuwen/go-bindata/...
35-
36-
go-bindata -prefix "assets/dist" -pkg "assets" -o "pkg/assets/bindata.go" -tags "release" assets/dist/...
37-
38-
OS_BUILD_TAGS=release hack/build-go.sh
39-
```
27+
1. Make sure all dev dependencies are up to date by running `hack/install-assets.sh`
28+
2. Run `hack/build-assets.sh`
29+
3. Run `hack/build-go.sh`
4030
41-
Now when starting the openshift all-in-one server it will also serve the console assets. The default listens at [http://localhost:8091](http://localhost:8091)
31+
The assets served by the OpenShift all-in-one server will now be up to date. By default the assets are served from [http://localhost:8091](http://localhost:8091)

bower.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "assets",
33
"version": "0.0.0",
44
"dependencies": {
5-
"angular": "~1.2.0",
6-
"json3": "~3.3.1",
7-
"es5-shim": "~3.1.0",
8-
"bootstrap-sass-official": "~3.2.0",
9-
"angular-resource": "~1.2.0",
10-
"angular-cookies": "~1.2.0",
11-
"angular-sanitize": "~1.2.0",
12-
"angular-animate": "~1.2.0",
13-
"angular-touch": "~1.2.0",
14-
"angular-route": "~1.2.0",
15-
"angular-bootstrap": "~0.11.0"
5+
"angular": "1.2.26",
6+
"json3": "3.3.2",
7+
"es5-shim": "3.1.1",
8+
"bootstrap-sass-official": "3.2.0+2",
9+
"angular-resource": "1.2.26",
10+
"angular-cookies": "1.2.26",
11+
"angular-sanitize": "1.2.26",
12+
"angular-animate": "1.2.26",
13+
"angular-touch": "1.2.26",
14+
"angular-route": "1.2.26",
15+
"angular-bootstrap": "0.11.2"
1616
},
1717
"devDependencies": {
18-
"angular-mocks": "~1.2.0",
19-
"angular-scenario": "~1.2.0"
18+
"angular-mocks": "1.2.26",
19+
"angular-scenario": "1.2.26"
2020
},
2121
"appPath": "app"
2222
}

package.json

+33-29
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,40 @@
22
"name": "assets",
33
"version": "0.0.0",
44
"dependencies": {},
5+
"repository": {
6+
"type": "git",
7+
"url": "git://github.com/openshift/origin.git"
8+
},
59
"devDependencies": {
6-
"grunt": "~0.4.5",
7-
"grunt-autoprefixer": "^0.7.3",
8-
"grunt-concurrent": "^0.5.0",
9-
"grunt-contrib-clean": "^0.5.0",
10-
"grunt-contrib-compass": "^0.7.2",
11-
"grunt-contrib-concat": "^0.4.0",
12-
"grunt-contrib-connect": "^0.7.1",
13-
"grunt-contrib-copy": "^0.5.0",
14-
"grunt-contrib-cssmin": "^0.9.0",
15-
"grunt-contrib-htmlmin": "^0.3.0",
16-
"grunt-contrib-imagemin": "^0.8.1",
17-
"grunt-contrib-jshint": "^0.10.0",
18-
"grunt-contrib-uglify": "^0.4.0",
19-
"grunt-contrib-watch": "^0.6.1",
20-
"grunt-filerev": "^0.2.1",
21-
"grunt-google-cdn": "^0.4.0",
22-
"grunt-newer": "^0.7.0",
23-
"grunt-ng-annotate": "^0.3.0",
24-
"grunt-svgmin": "^0.4.0",
25-
"grunt-usemin": "^2.1.1",
26-
"grunt-wiredep": "^1.7.0",
27-
"jshint-stylish": "^0.2.0",
28-
"load-grunt-tasks": "^0.4.0",
29-
"time-grunt": "^0.3.1",
30-
"karma-phantomjs-launcher": "~0.1.4",
31-
"karma": "~0.12.23",
32-
"karma-jasmine": "~0.1.5",
33-
"grunt-karma": "~0.9.0",
34-
"karma-coverage": "~0.2.6",
10+
"grunt": "0.4.5",
11+
"grunt-autoprefixer": "0.7.6",
12+
"grunt-concurrent": "0.5.0",
13+
"grunt-contrib-clean": "0.5.0",
14+
"grunt-contrib-compass": "0.7.2",
15+
"grunt-contrib-concat": "0.4.0",
16+
"grunt-contrib-connect": "0.7.1",
17+
"grunt-contrib-copy": "0.5.0",
18+
"grunt-contrib-cssmin": "0.9.0",
19+
"grunt-contrib-htmlmin": "0.3.0",
20+
"grunt-contrib-imagemin": "0.8.1",
21+
"grunt-contrib-jshint": "0.10.0",
22+
"grunt-contrib-uglify": "0.4.1",
23+
"grunt-contrib-watch": "0.6.1",
24+
"grunt-filerev": "0.2.1",
25+
"grunt-google-cdn": "0.4.3",
26+
"grunt-newer": "0.7.0",
27+
"grunt-ng-annotate": "0.3.2",
28+
"grunt-svgmin": "0.4.0",
29+
"grunt-usemin": "2.4.0",
30+
"grunt-wiredep": "1.9.0",
31+
"jshint-stylish": "0.2.0",
32+
"load-grunt-tasks": "0.4.0",
33+
"time-grunt": "0.3.2",
34+
"karma-phantomjs-launcher": "0.1.4",
35+
"karma": "0.12.23",
36+
"karma-jasmine": "0.1.5",
37+
"grunt-karma": "0.9.0",
38+
"karma-coverage": "0.2.6",
3539
"grunt-istanbul-coverage": "0.0.5"
3640
},
3741
"engines": {

0 commit comments

Comments
 (0)