Skip to content

Commit 22200a5

Browse files
committed
Make console development mode build/run on an openshift cluster
1 parent b503ddd commit 22200a5

File tree

6 files changed

+26
-6
lines changed

6 files changed

+26
-6
lines changed

.s2i/bin/assemble

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
/usr/libexec/s2i/assemble
3+
rc=$?
4+
5+
if [ $rc -eq 0 ]; then
6+
bower install
7+
rc=$?
8+
fi
9+
10+
exit $rc

.s2i/bin/run

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
if [ -f /origin-web-console-config/config.js ]; then
4+
cp -f /origin-web-console-config/config.js app/config.js
5+
else
6+
echo "No config.js is mounted, using default development config."
7+
fi
8+
9+
grunt serve --hostname=0.0.0.0 --disable-live-reload

Gruntfile.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ module.exports = function (grunt) {
4545
tasks: ['newer:jshint:all'],
4646
options: {
4747
livereload: grunt.option('disable-live-reload') ? false : {
48-
key: grunt.file.read('server.key'),
49-
cert: grunt.file.read('server.crt')
48+
key: grunt.file.read('tls/tls.key'),
49+
cert: grunt.file.read('tls/tls.crt')
5050
}
5151
}
5252
},
@@ -62,8 +62,8 @@ module.exports = function (grunt) {
6262
files: '<%= yeoman.app %>/views/{,*/}*.html',
6363
options: {
6464
livereload: grunt.option('disable-live-reload') ? false : {
65-
key: grunt.file.read('server.key'),
66-
cert: grunt.file.read('server.crt')
65+
key: grunt.file.read('tls/tls.key'),
66+
cert: grunt.file.read('tls/tls.crt')
6767
}
6868
}
6969
},
@@ -103,8 +103,8 @@ module.exports = function (grunt) {
103103
port: grunt.option('port') || 9000,
104104
// Change this to '0.0.0.0' to access the server from outside.
105105
hostname: grunt.option('hostname') || 'localhost',
106-
key: grunt.file.read('server.key'),
107-
cert: grunt.file.read('server.crt'),
106+
key: grunt.file.read('tls/tls.key'),
107+
cert: grunt.file.read('tls/tls.crt'),
108108
livereload: grunt.option('disable-live-reload') ? false : 35729
109109
},
110110
livereload: {

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"url": "git://github.com/openshift/origin.git"
88
},
99
"devDependencies": {
10+
"bower": "1.8.0",
1011
"clean-css": "3.4.12",
1112
"connect-modrewrite": "0.7.9",
1213
"grunt": "0.4.5",

server.crt tls/tls.crt

File renamed without changes.

server.key tls/tls.key

File renamed without changes.

0 commit comments

Comments
 (0)