x/bansho
Code Issues Proposed changes

Rename application to Bansho

Browse Source
This commit is contained in:
Vincent Fournier 2015-04-30 09:51:00 -04:00
parent aaffa645de
commit af0d993d53
6 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -22,13 +22,13 @@ RUN a2enmod proxy_http
ADD container/configure.sh /configure.sh ADD container/configure.sh /configure.sh
# Bansho files # Bansho files
ADD /package.json /opt/adagios-frontend/package.json ADD /package.json /opt/bansho/package.json
ADD /.bowerrc /opt/adagios-frontend/.bowerrc ADD /.bowerrc /opt/bansho/.bowerrc
ADD /.jshintrc /opt/adagios-frontend/.jshintrc ADD /.jshintrc /opt/bansho/.jshintrc
ADD /Gruntfile.js /opt/adagios-frontend/Gruntfile.js ADD /Gruntfile.js /opt/bansho/Gruntfile.js
ADD /bower.json /opt/adagios-frontend/bower.json ADD /bower.json /opt/bansho/bower.json
RUN cd /opt/adagios-frontend/ && npm install --unsafe-perm RUN cd /opt/bansho/ && npm install --unsafe-perm
ADD /app /opt/adagios-frontend/app ADD /app /opt/bansho/app
# Override those variables at runtime to point Bansho to another backend # Override those variables at runtime to point Bansho to another backend
ENV BANSHO_BACKEND surveil ENV BANSHO_BACKEND surveil
@ -37,6 +37,6 @@ ENV BANSHO_SURVEIL_URL http://surveil:8080/
ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/ ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/
CMD ./configure.sh && \ CMD ./configure.sh && \
cd /opt/adagios-frontend && \ cd /opt/bansho && \
bash -c "if [ $BANSHO_PROD = true ] ; then grunt production:$BANSHO_BACKEND ; fi" && \ bash -c "if [ $BANSHO_PROD = true ] ; then grunt production:$BANSHO_BACKEND ; fi" && \
bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND" bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"

16
Gruntfile.js
View File

@ -49,16 +49,16 @@ module.exports = function (grunt) {
adagios: { adagios: {
files: [ files: [
{ {
dest: '<%= project.app %>/components/live/live.js', src: '<%= project.app %>/components/live/adagios.js',
src: '<%= project.app %>/components/live/adagios.js' dest: '<%= project.app %>/components/live/live.js'
} }
] ]
}, },
surveil: { surveil: {
files: [ files: [
{ {
dest: '<%= project.app %>/components/live/live.js', src: '<%= project.app %>/components/live/surveil.js',
src: '<%= project.app %>/components/live/surveil.js' dest: '<%= project.app %>/components/live/live.js'
} }
] ]
} }
@ -171,12 +171,8 @@ module.exports = function (grunt) {
]); ]);
grunt.registerTask('production:adagios', [ grunt.registerTask('production:adagios', [
'clean', 'sass', 'copy:prod', 'useminPrepare:html', 'concat:generated', 'clean', 'sass', 'copy:prod','copy:adagios', 'useminPrepare:html', 'concat:generated', 'uglify:generated', 'usemin:html']);
'copy:adagios',
'uglify:generated', 'usemin:html']);
grunt.registerTask('production:surveil', [ grunt.registerTask('production:surveil', [
'clean', 'sass', 'copy:prod', 'useminPrepare:html', 'concat:generated', 'clean', 'sass', 'copy:prod', 'copy:surveil', 'useminPrepare:html', 'concat:generated', 'uglify:generated', 'usemin:html']);
'copy:surveil',
'uglify:generated', 'usemin:html']);
}; };

14
Makefile
View File

@ -3,23 +3,23 @@ all: build daemon
clean: kill remove clean: kill remove
build: build:
sudo docker build -t adg-fe . sudo docker build -t bansho .
rebuild: rebuild:
sudo docker build --no-cache -t adg-fe . sudo docker build --no-cache -t bansho .
interactive: interactive:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/adagios-frontend/dist -e BANSHO_ENV=false -i -t --name adg-fe adg-fe bash sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/bansho/dist -e BANSHO_ENV=false -i -t --name bansho bansho bash
daemon: daemon:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/adagios-frontend/dist -e BANSHO_PROD=false -d -t --name adg-fe adg-fe sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/bansho/dist -e BANSHO_PROD=false -d -t --name bansho bansho
grunt development:surveil grunt development:surveil
production: production:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -d -t --name adg-fe adg-fe sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -d -t --name bansho bansho
kill: kill:
sudo docker kill adg-fe sudo docker kill bansho
remove: remove:
sudo docker rm -f adg-fe sudo docker rm -f bansho

6
bower.json
View File

@ -1,8 +1,8 @@
{ {
"name": "adagios", "name": "Bansho",
"description": "Adagios front-end", "description": "Web UI for Monitoring tool",
"version": "0.1.0", "version": "0.1.0",
"homepage": "https://github.com/titilambert/adagios-frontend", "homepage": "https://github.com/savoirfairelinux/bansho",
"license": "AGPLv3", "license": "AGPLv3",
"private": true, "private": true,
"dependencies": { "dependencies": {

4
container/000-default.conf
View File

@ -1,11 +1,11 @@
<Directory "/opt/adagios-frontend/dist/"> <Directory "/opt/bansho/dist/">
Order allow,deny Order allow,deny
Allow from all Allow from all
Require all granted Require all granted
</Directory> </Directory>
<VirtualHost *:8888> <VirtualHost *:8888>
Alias / /opt/adagios-frontend/dist/ Alias / /opt/bansho/dist/
ProxyPreserveHost On ProxyPreserveHost On

6
package.json
View File

@ -1,9 +1,9 @@
{ {
"name": "adagios", "name": "Bansho",
"private": true, "private": true,
"version": "0.1.0", "version": "0.1.0",
"description": "Adagios front-end", "description": "Web UI for Monitoring tool",
"repository": "https://github.com/titilambert/adagios-frontend", "repository": "https://github.com/savoirfairelinux/bansho",
"license": "AGPLv3", "license": "AGPLv3",
"devDependencies": { "devDependencies": {
"bower": "^1.3.1", "bower": "^1.3.1",