diff --git a/.gitignore b/.gitignore index 2fbb5cd36..6760c7934 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ bower_components *.iml dist dist/* -ui-for-docker-checksum.txt +portainer-checksum.txt diff --git a/.godir b/.godir index 35f9ef908..92ec32bad 100644 --- a/.godir +++ b/.godir @@ -1 +1 @@ -dockerui +portainer diff --git a/Dockerfile b/Dockerfile index f150e7308..0735dc57e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ VOLUME /data EXPOSE 9000 -ENTRYPOINT ["/ui-for-docker"] +ENTRYPOINT ["/portainer"] diff --git a/LICENSE b/LICENSE index ce4e04909..52f0f4b98 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Cloudinovasi-ui: Copyright (c) 2016 Cloudinovasi +Portainer: Copyright (c) 2016 CloudInovasi Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,7 +16,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com), Anthony Lapenna (anthonylapenna at cloudinovasi dot id) diff --git a/Procfile b/Procfile index 0b2da62c5..1390d66ed 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: dockerui -p ":$PORT" -e "$DOCKER_ENDPOINT" +web: portainer -p ":$PORT" -e "$DOCKER_ENDPOINT" diff --git a/README.md b/README.md index a2cb30d84..36eaf2af6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,9 @@ -# Cloudinovasi UI for Docker +# Portainer -A fork of the amazing UI for Docker by Michael Crosby and Kevan Ahlquist (https://github.com/kevana/ui-for-docker) using the rdash-angular theme (https://github.com/rdash/rdash-angular). +Portainer is a web interface for the Docker remote API. ![Dashboard](/dashboard.png) -UI For Docker is a web interface for the Docker Remote API. The goal is to provide a pure client side implementation so it is effortless to connect and manage docker. - -## Goals - -* Minimal dependencies - I really want to keep this project a pure html/js app. -* Consistency - The web UI should be consistent with the commands found on the docker CLI. - ## Supported Docker versions The following Docker versions are supported: @@ -22,28 +15,28 @@ The following Docker versions are supported: ### Quickstart -1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/cloudinovasi-ui` +1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer` 2. Open your browser to `http://:9000` -Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. +Bind mounting the Unix socket into the Portainer container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. ### Specify socket to connect to Docker daemon -By default UI For Docker connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`. +By default Portainer connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`. You can use the `--host`, `-H` flags to change this socket: ``` # Connect to a tcp socket: -$ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -H tcp://127.0.0.1:2375 +$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://127.0.0.1:2375 ``` ``` # Connect to another unix socket: -$ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -H unix:///path/to/docker.sock +$ docker run -d -p 9000:9000 cloudinovasi/portainer -H unix:///path/to/docker.sock ``` ### Swarm support @@ -54,17 +47,17 @@ You can access a specific view for you Swarm cluster by defining the `--swarm` f ``` # Connect to a tcp socket and enable Swarm: -$ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -H tcp://: --swarm +$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://: --swarm ``` *NOTE*: Due to Swarm not exposing information in a machine readable way, the app is bound to a specific version of Swarm at the moment. -### Change address/port UI For Docker is served on -UI For Docker listens on port 9000 by default. If you run UI For Docker inside a container then you can bind the container's internal port to any external address and port: +### Change address/port Portainer is served on +Portainer listens on port 9000 by default. If you run Portainer inside a container then you can bind the container's internal port to any external address and port: ``` -# Expose UI For Docker on 10.20.30.1:80 -$ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/cloudinovasi-ui +# Expose Portainer on 10.20.30.1:80 +$ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer ``` ### Access a Docker engine protected via TLS @@ -74,13 +67,13 @@ Ensure that you have access to the CA, the cert and the public key used to acces These files will need to be named `ca.pem`, `cert.pem` and `key.pem` respectively. Store them somewhere on your disk and mount a volume containing these files inside the UI container: ``` -$ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify +$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify ``` You can also use the `--tlscacert`, `--tlscert` and `--tlskey` flags if you want to change the default path to the CA, certificate and key file respectively: ``` -$ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify --tlscacert /certs/myCa.pem --tlscert /certs/myCert.pem --tlskey /certs/myKey.pem +$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify --tlscacert /certs/myCa.pem --tlscert /certs/myCert.pem --tlskey /certs/myKey.pem ``` *Note*: Replace `/path/to/certs` to the path to the certificate files on your disk. @@ -92,10 +85,10 @@ You can use the `--logo` flag to specify an URL to your own logo. For example, using the Docker logo: ``` -$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/cloudinovasi-ui --logo "https://www.docker.com/sites/all/themes/docker/assets/images/brand-full.svg" +$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer --logo "https://www.docker.com/sites/all/themes/docker/assets/images/brand-full.svg" ``` -The custom logo will replace the CloudInovasi logo in the UI. +The custom logo will replace the Portainer logo in the UI. ### Hide containers with specific labels @@ -110,38 +103,38 @@ $ docker run -d --label owner=acme nginx You can hide it in the view by starting the ui with: ``` -$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/cloudinovasi-ui -l owner=acme +$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer -l owner=acme ``` ### Reverse proxy configuration Has been tested with Nginx 1.11. -Use the following configuration to host the UI at `myhost.mydomain.com/dockerui`: +Use the following configuration to host the UI at `myhost.mydomain.com/portainer`: ```nginx -upstream cloudinovasi-ui { +upstream portainer { server ADDRESS:PORT; } server { listen 80; - location /dockerui/ { + location /portainer/ { proxy_http_version 1.1; proxy_set_header Connection ""; - proxy_pass http://cloudinovasi-ui/; + proxy_pass http://portainer/; } - location /dockerui/ws/ { + location /portainer/ws/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_http_version 1.1; - proxy_pass http://cloudinovasi-ui/ws/; + proxy_pass http://portainer/ws/; } } ``` -Replace `ADDRESS:PORT` with the CloudInovasi UI container details. +Replace `ADDRESS:PORT` with the Portainer container details. ### Host your own apps @@ -153,10 +146,10 @@ For more information about hosting your own template definition and the format, ### Available options -The following options are available for the `ui-for-docker` binary: +The following options are available for the `portainer` binary: * `--host`, `-H`: Docker daemon endpoint (default: `"unix:///var/run/docker.sock"`) -* `--bind`, `-p`: Address and port to serve UI For Docker (default: `":9000"`) +* `--bind`, `-p`: Address and port to serve Portainer (default: `":9000"`) * `--data`, `-d`: Path to the data folder (default: `"."`) * `--assets`, `-a`: Path to the assets (default: `"."`) * `--swarm`, `-s`: Swarm cluster support (default: `false`) diff --git a/api/main.go b/api/main.go index c98c78ff2..78627f693 100644 --- a/api/main.go +++ b/api/main.go @@ -1,4 +1,4 @@ -package main // import "github.com/cloudinovasi/ui-for-docker" +package main // import "github.com/cloudinovasi/portainer" import ( "gopkg.in/alecthomas/kingpin.v2" @@ -9,7 +9,7 @@ func main() { kingpin.Version("1.7.0") var ( endpoint = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String() - addr = kingpin.Flag("bind", "Address and port to serve UI For Docker").Default(":9000").Short('p').String() + addr = kingpin.Flag("bind", "Address and port to serve Portainer").Default(":9000").Short('p').String() assets = kingpin.Flag("assets", "Path to the assets").Default(".").Short('a').String() data = kingpin.Flag("data", "Path to the data").Default(".").Short('d').String() tlsverify = kingpin.Flag("tlsverify", "TLS support").Default("false").Bool() diff --git a/app/app.js b/app/app.js index 8467cc621..26537c1be 100644 --- a/app/app.js +++ b/app/app.js @@ -1,13 +1,13 @@ -angular.module('uifordocker', [ - 'uifordocker.templates', +angular.module('portainer', [ + 'portainer.templates', 'ui.bootstrap', 'ui.router', 'ui.select', 'ngCookies', 'ngSanitize', - 'uifordocker.services', - 'uifordocker.helpers', - 'uifordocker.filters', + 'portainer.services', + 'portainer.helpers', + 'portainer.filters', 'dashboard', 'container', 'containerConsole', diff --git a/app/directives/header-content.js b/app/directives/header-content.js index 0e8a8bb7c..40df9a066 100644 --- a/app/directives/header-content.js +++ b/app/directives/header-content.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdHeaderContent', function rdHeaderContent() { var directive = { requires: '^rdHeader', diff --git a/app/directives/header-title.js b/app/directives/header-title.js index 65c5d2833..b0816529d 100644 --- a/app/directives/header-title.js +++ b/app/directives/header-title.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdHeaderTitle', function rdHeaderTitle() { var directive = { requires: '^rdHeader', diff --git a/app/directives/header.js b/app/directives/header.js index 66752e7e7..016a25a0c 100644 --- a/app/directives/header.js +++ b/app/directives/header.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdHeader', function rdHeader() { var directive = { scope: { diff --git a/app/directives/loading.js b/app/directives/loading.js index b645f870c..f2d9a371a 100644 --- a/app/directives/loading.js +++ b/app/directives/loading.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdLoading', function rdLoading() { var directive = { restrict: 'AE', diff --git a/app/directives/widget-body.js b/app/directives/widget-body.js index 1f7cfc8a5..ad8de2e15 100644 --- a/app/directives/widget-body.js +++ b/app/directives/widget-body.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdWidgetBody', function rdWidgetBody() { var directive = { requires: '^rdWidget', diff --git a/app/directives/widget-footer.js b/app/directives/widget-footer.js index c4e5b9a49..9cb1dda96 100644 --- a/app/directives/widget-footer.js +++ b/app/directives/widget-footer.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdWidgetFooter', function rdWidgetFooter() { var directive = { requires: '^rdWidget', diff --git a/app/directives/widget-header.js b/app/directives/widget-header.js index 22bed24cd..4106fbc79 100644 --- a/app/directives/widget-header.js +++ b/app/directives/widget-header.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdWidgetHeader', function rdWidgetTitle() { var directive = { requires: '^rdWidget', diff --git a/app/directives/widget-taskbar.js b/app/directives/widget-taskbar.js index 2a0f7ebda..4b39bcc37 100644 --- a/app/directives/widget-taskbar.js +++ b/app/directives/widget-taskbar.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdWidgetTaskbar', function rdWidgetTaskbar() { var directive = { requires: '^rdWidget', diff --git a/app/directives/widget.js b/app/directives/widget.js index 77c1f53cf..56fea70e5 100644 --- a/app/directives/widget.js +++ b/app/directives/widget.js @@ -1,5 +1,5 @@ angular -.module('uifordocker') +.module('portainer') .directive('rdWidget', function rdWidget() { var directive = { scope: { diff --git a/app/shared/filters.js b/app/shared/filters.js index 4c73cc31b..21b4ea019 100644 --- a/app/shared/filters.js +++ b/app/shared/filters.js @@ -1,4 +1,4 @@ -angular.module('uifordocker.filters', []) +angular.module('portainer.filters', []) .filter('truncate', function () { 'use strict'; return function (text, length, end) { diff --git a/app/shared/helpers.js b/app/shared/helpers.js index 02d787d2a..a2aa7d74c 100644 --- a/app/shared/helpers.js +++ b/app/shared/helpers.js @@ -1,4 +1,4 @@ -angular.module('uifordocker.helpers', []) +angular.module('portainer.helpers', []) .factory('ImageHelper', [function ImageHelperFactory() { 'use strict'; return { diff --git a/app/shared/services.js b/app/shared/services.js index 33d7532ca..3d4c53352 100644 --- a/app/shared/services.js +++ b/app/shared/services.js @@ -1,4 +1,4 @@ -angular.module('uifordocker.services', ['ngResource', 'ngSanitize']) +angular.module('portainer.services', ['ngResource', 'ngSanitize']) .factory('Container', ['$resource', 'Settings', function ContainerFactory($resource, Settings) { 'use strict'; // Resource for interacting with the docker containers diff --git a/assets/images/logo.png b/assets/images/logo.png index eb7fcc7aa..dee08bdde 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ diff --git a/bower.json b/bower.json index 7956be813..6d85af4a5 100644 --- a/bower.json +++ b/bower.json @@ -1,18 +1,18 @@ { - "name": "uifordocker", + "name": "portainer", "version": "1.7.0", - "homepage": "https://github.com/kevana/ui-for-docker", + "homepage": "https://github.com/cloud-inovasi/portainer", "authors": [ - "Michael Crosby ", - "Kevan Ahlquist ", "Anthony Lapenna " ], "description": "A web interface for the Docker Remote API.", "keywords": [ - "uifordocker", - "dockerui", "docker", - "api" + "ui", + "api", + "portainer", + "uifordocker", + "dockerui" ], "license": "MIT", "ignore": [ diff --git a/dashboard.png b/dashboard.png index b9ac37b36..7bdb73e86 100644 Binary files a/dashboard.png and b/dashboard.png differ diff --git a/examples/nginx-basic-auth/default.conf b/examples/nginx-basic-auth/default.conf index 49d03c5ec..c39a2db16 100644 --- a/examples/nginx-basic-auth/default.conf +++ b/examples/nginx-basic-auth/default.conf @@ -1,5 +1,5 @@ -upstream dockerui { - server dockerui:9000; +upstream portainer { + server portainer:9000; } server { @@ -12,6 +12,6 @@ server { proxy_http_version 1.1; proxy_set_header Connection ""; - proxy_pass http://dockerui; + proxy_pass http://portainer; } } diff --git a/examples/nginx-basic-auth/docker-compose.yml b/examples/nginx-basic-auth/docker-compose.yml index aef0d3c79..f644ffd5b 100644 --- a/examples/nginx-basic-auth/docker-compose.yml +++ b/examples/nginx-basic-auth/docker-compose.yml @@ -1,10 +1,10 @@ -dockerui: - image: cloudinovasi/ui-for-docker +portainer: + image: cloudinovasi/portainer command: -e http://: nginx: build: . links: - - dockerui + - portainer ports: - 80:80 diff --git a/gruntFile.js b/gruntFile.js index 2bda73425..4b9ae9fb8 100644 --- a/gruntFile.js +++ b/gruntFile.js @@ -93,7 +93,7 @@ module.exports = function (grunt) { }, clean: { all: ['<%= distdir %>/*'], - app: ['<%= distdir %>/*', '!<%= distdir %>/ui-for-docker'], + app: ['<%= distdir %>/*', '!<%= distdir %>/portainer'], tmpl: ['<%= distdir %>/templates'] }, copy: { @@ -253,35 +253,35 @@ module.exports = function (grunt) { }, shell: { buildImage: { - command: 'docker build --rm -t ui-for-docker .' + command: 'docker build --rm -t portainer .' }, buildBinary: { command: [ 'docker run --rm -v $(pwd)/api:/src centurylink/golang-builder', - 'shasum api/ui-for-docker > ui-for-docker-checksum.txt', + 'shasum api/portainer > portainer-checksum.txt', 'mkdir -p dist', - 'mv api/ui-for-docker dist/' + 'mv api/portainer dist/' ].join(' && ') }, run: { command: [ - 'docker stop ui-for-docker', - 'docker rm ui-for-docker', - 'docker run --privileged -d -p 9000:9000 -v /tmp/docker-ui:/data -v /var/run/docker.sock:/var/run/docker.sock --name ui-for-docker ui-for-docker -d /data' + 'docker stop portainer', + 'docker rm portainer', + 'docker run --privileged -d -p 9000:9000 -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer -d /data' ].join(';') }, runSwarm: { command: [ - 'docker stop ui-for-docker', - 'docker rm ui-for-docker', - 'docker run -d -p 9000:9000 -v /tmp/docker-ui:/data --name ui-for-docker ui-for-docker -H tcp://10.0.7.10:4000 --swarm -d /data' + 'docker stop portainer', + 'docker rm portainer', + 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:4000 --swarm -d /data' ].join(';') }, runSsl: { command: [ - 'docker stop ui-for-docker', - 'docker rm ui-for-docker', - 'docker run -d -p 9000:9000 -v /tmp/docker-ui:/data -v /tmp/docker-ssl:/certs --name ui-for-docker ui-for-docker -H tcp://10.0.7.10:2376 -d /data --tlsverify' + 'docker stop portainer', + 'docker rm portainer', + 'docker run -d -p 9000:9000 -v /tmp/portainer:/data -v /tmp/docker-ssl:/certs --name portainer portainer -H tcp://10.0.7.10:2376 -d /data --tlsverify' ].join(';') }, cleanImages: { @@ -291,7 +291,7 @@ module.exports = function (grunt) { 'if': { binaryNotExist: { options: { - executable: 'dist/ui-for-docker' + executable: 'dist/portainer' }, ifFalse: ['shell:buildBinary'] } diff --git a/index.html b/index.html index 80cb7384b..3b60136b7 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - CloudInovasi UI for Docker + Portainer @@ -32,8 +32,8 @@
- CloudInovasi UI {{ uiVersion }} + Portainer {{ uiVersion }}
diff --git a/package.json b/package.json index 7abc1365e..100fb33ed 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,19 @@ { - "author": "Michael Crosby & Kevan Ahlquist", - "name": "uifordocker", - "homepage": "https://github.com/kevana/ui-for-docker", + "author": "Cloud Inovasi", + "name": "portainer", + "homepage": "https://github.com/cloud-inovasi/portainer", "version": "1.7.0", "repository": { "type": "git", - "url": "git@github.com:kevana/ui-for-docker.git" + "url": "git@github.com:cloud-inovasi/portainer.git" }, "bugs": { - "url": "https://github.com/kevana/ui-for-docker/issues" + "url": "https://github.com/cloud-inovasi/portainer/issues" }, "licenses": [ { "type": "MIT", - "url": "https://raw.githubusercontent.com/kevana/ui-for-docker/master/LICENSE" + "url": "https://raw.githubusercontent.com/cloud-inovasi/portainer/develop/LICENSE" } ], "engines": { diff --git a/test/unit/app/components/containerController.spec.js b/test/unit/app/components/containerController.spec.js index d466fa902..6b2ec43b6 100644 --- a/test/unit/app/components/containerController.spec.js +++ b/test/unit/app/components/containerController.spec.js @@ -1,7 +1,7 @@ describe('ContainerController', function () { var $scope, $httpBackend, mockContainer, $routeParams; - beforeEach(module('dockerui')); + beforeEach(module('portainer')); beforeEach(inject(function ($rootScope, $controller, _$routeParams_) { @@ -22,8 +22,8 @@ describe('ContainerController', function () { $httpBackend.expectGET('dockerapi/containers/json').respond({ 'Created': 1421817232, 'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f', - 'Image': 'dockerui:latest', - 'Name': '/dockerui' + 'Image': 'portainer:latest', + 'Name': '/portainer' }); } @@ -33,8 +33,8 @@ describe('ContainerController', function () { $scope.container = { 'Created': 1421817232, 'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f', - 'Image': 'dockerui:latest', - 'Name': '/dockerui' + 'Image': 'portainer:latest', + 'Name': '/portainer' }; $scope.container.newContainerName = "newName"; diff --git a/test/unit/app/components/containerTopController.spec.js b/test/unit/app/components/containerTopController.spec.js index 15c1bb9b0..e98a8a55a 100644 --- a/test/unit/app/components/containerTopController.spec.js +++ b/test/unit/app/components/containerTopController.spec.js @@ -1,7 +1,7 @@ describe("ContainerTopController", function () { var $scope, $httpBackend, $routeParams; - beforeEach(angular.mock.module('dockerui')); + beforeEach(angular.mock.module('portainer')); beforeEach(inject(function (_$rootScope_, _$httpBackend_, $controller, _$routeParams_) { $scope = _$rootScope_.$new(); diff --git a/test/unit/app/components/networkController.spec.js b/test/unit/app/components/networkController.spec.js index 649a66630..c1e8957c3 100644 --- a/test/unit/app/components/networkController.spec.js +++ b/test/unit/app/components/networkController.spec.js @@ -1,7 +1,7 @@ describe('NetworkController', function () { var $scope, $httpBackend, $routeParams; - beforeEach(module('dockerui')); + beforeEach(module('portainer')); beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) { $scope = {}; $httpBackend = _$httpBackend_; diff --git a/test/unit/app/components/networksController.spec.js b/test/unit/app/components/networksController.spec.js index 0f3ce3280..8fb40e49e 100644 --- a/test/unit/app/components/networksController.spec.js +++ b/test/unit/app/components/networksController.spec.js @@ -1,7 +1,7 @@ describe('NetworksController', function () { var $scope, $httpBackend, $routeParams; - beforeEach(module('dockerui')); + beforeEach(module('portainer')); beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) { $scope = {}; $httpBackend = _$httpBackend_; diff --git a/test/unit/app/components/startContainerController.spec.js b/test/unit/app/components/startContainerController.spec.js index 2988b9066..abbabcde7 100644 --- a/test/unit/app/components/startContainerController.spec.js +++ b/test/unit/app/components/startContainerController.spec.js @@ -1,7 +1,7 @@ describe('startContainerController', function () { var scope, $location, createController, mockContainer, $httpBackend; - beforeEach(angular.mock.module('dockerui')); + beforeEach(angular.mock.module('portainer')); beforeEach(inject(function ($rootScope, $controller, _$location_) { $location = _$location_; @@ -20,11 +20,11 @@ describe('startContainerController', function () { })); function expectGetContainers() { $httpBackend.expectGET('dockerapi/containers/json?all=1').respond([{ - 'Command': './dockerui -e /docker.sock', + 'Command': './portainer -e /docker.sock', 'Created': 1421817232, 'Id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f', - 'Image': 'dockerui:latest', - 'Names': ['/dockerui'], + 'Image': 'portainer:latest', + 'Names': ['/portainer'], 'Ports': [{ 'IP': '0.0.0.0', 'PrivatePort': 9000, diff --git a/test/unit/app/components/statsController.spec.js b/test/unit/app/components/statsController.spec.js index 2cbc138ba..879e43544 100644 --- a/test/unit/app/components/statsController.spec.js +++ b/test/unit/app/components/statsController.spec.js @@ -1,7 +1,7 @@ describe("StatsController", function () { var $scope, $httpBackend, $routeParams; - beforeEach(angular.mock.module('dockerui')); + beforeEach(angular.mock.module('portainer')); beforeEach(inject(function (_$rootScope_, _$httpBackend_, $controller, _$routeParams_) { $scope = _$rootScope_.$new(); diff --git a/test/unit/app/components/volumesController.spec.js b/test/unit/app/components/volumesController.spec.js index ef567c07a..1e127acaa 100644 --- a/test/unit/app/components/volumesController.spec.js +++ b/test/unit/app/components/volumesController.spec.js @@ -1,7 +1,7 @@ describe('VolumesController', function () { var $scope, $httpBackend, $routeParams; - beforeEach(module('dockerui')); + beforeEach(module('portainer')); beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) { $scope = {}; $httpBackend = _$httpBackend_; diff --git a/test/unit/app/shared/filters.spec.js b/test/unit/app/shared/filters.spec.js index b2f701fb4..5b8bb17d8 100644 --- a/test/unit/app/shared/filters.spec.js +++ b/test/unit/app/shared/filters.spec.js @@ -1,5 +1,5 @@ describe('filters', function () { - beforeEach(module('dockerui.filters')); + beforeEach(module('portainer.filters')); describe('truncate', function () { it('should truncate the string to 10 characters ending in "..." by default', inject(function (truncateFilter) { diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js index 1b180ffac..fae790498 100644 --- a/test/unit/karma.conf.js +++ b/test/unit/karma.conf.js @@ -7,7 +7,7 @@ files = [ JASMINE_ADAPTER, 'dist/angular.js', 'dist/vendor.js', - 'dist/dockerui.js', + 'dist/portainer.js', 'bower_components/angular-mocks/angular-mocks.js', 'test/unit/**/*.spec.js' ];