Fixed grunt template issues, version bump.

pull/2/head
Kevan Ahlquist 2015-01-18 16:39:10 -06:00
parent 2974f69932
commit f65fed8d0a
7 changed files with 11 additions and 8 deletions

1
.gitignore vendored
View File

@ -3,5 +3,4 @@ logs/*
dockerui
*.esproj/*
node_modules
dist
.idea

View File

@ -12,6 +12,10 @@ build:
grunt build
docker build --rm -t dockerui .
build-release:
grunt release
docker build --rm -t dockerui .
test:
grunt

View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>', ['<%= pkg.name %>.templates', 'ngRoute', '<%= pkg.name %>.services', '<%= pkg.name %>.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
.config(['$routeProvider', function ($routeProvider) {
'use strict';
$routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@ -14,5 +14,5 @@ angular.module('<%= pkg.name %>', ['<%= pkg.name %>.templates', 'ngRoute', '<%=
// You need to set this to the api endpoint without the port i.e. http://192.168.1.9
.constant('DOCKER_ENDPOINT', '/dockerapi')
.constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243
.constant('UI_VERSION', 'v<%= pkg.version %>')
.constant('DOCKER_API_VERSION', 'v1.15');
.constant('UI_VERSION', 'v0.6.0')
.constant('DOCKER_API_VERSION', 'v1.16');

View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>.filters', [])
angular.module('dockerui.filters', [])
.filter('truncate', function() {
'use strict';
return function(text, length, end) {

View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>.services', ['ngResource'])
angular.module('dockerui.services', ['ngResource'])
.factory('Container', function($resource, Settings) {
'use strict';
// Resource for interacting with the docker containers

View File

@ -2,7 +2,7 @@
"author": "Michael Crosby",
"name": "dockerui",
"homepage": "https://github.com/crosbymichael/dockerui",
"version": "0.6.0-SNAPSHOT",
"version": "0.6.0",
"repository": {
"type": "git",
"url": "git@github.com:crosbymichael/dockerui.git"

View File

@ -1,5 +1,5 @@
describe('filters', function () {
beforeEach(module('<%= pkg.name %>.filters'));
beforeEach(module('dockerui.filters'));
describe('truncate', function () {
it('should truncate the string to 10 characters ending in "..." by default', inject(function(truncateFilter) {