diff --git a/.gitignore b/.gitignore index d59a598e1..26da19760 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ logs/* dockerui *.esproj/* node_modules -dist .idea diff --git a/Makefile b/Makefile index bbca93f01..05cad8499 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,10 @@ build: grunt build docker build --rm -t dockerui . +build-release: + grunt release + docker build --rm -t dockerui . + test: grunt diff --git a/app/app.js b/app/app.js index 6462a7584..531cf4515 100644 --- a/app/app.js +++ b/app/app.js @@ -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'); diff --git a/app/shared/filters.js b/app/shared/filters.js index e6becfdb8..2b390d9c9 100644 --- a/app/shared/filters.js +++ b/app/shared/filters.js @@ -1,4 +1,4 @@ -angular.module('<%= pkg.name %>.filters', []) +angular.module('dockerui.filters', []) .filter('truncate', function() { 'use strict'; return function(text, length, end) { diff --git a/app/shared/services.js b/app/shared/services.js index d825f94fd..5a06bc5db 100644 --- a/app/shared/services.js +++ b/app/shared/services.js @@ -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 diff --git a/package.json b/package.json index ce6e209d5..a1b9034ae 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/test/unit/shared/filters.spec.js b/test/unit/shared/filters.spec.js index d83f37911..b6c753faf 100644 --- a/test/unit/shared/filters.spec.js +++ b/test/unit/shared/filters.spec.js @@ -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) {