github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
582 Commits
497 Branches
146 Tags
110 MiB
Commit Graph

294 Commits (5432424a4086dba523e6e3bdc5c1f46a4ccf68ac)

Author SHA1 Message Date
Anthony Lapenna 71c091ae0d feat(ui): docker 1.9 support (#65) 2016-07-13 10:53:03 +12:00
Anthony Lapenna cab34e4069 feat(network): add advanced settings in network creation (subnet/gateway) 2016-07-08 17:26:18 +12:00
Anthony Lapenna e67e20ce18 feat(network): add the ability to specify a subnet/gateway when creating a network (#53) 2016-07-08 17:12:33 +12:00
Anthony Lapenna d253c0d494 chore(version): bump version number 2016-07-08 16:26:29 +12:00
Anthony Lapenna c74e8fc732 style(lint): fix jshint issue 2016-07-08 16:20:31 +12:00
Anthony Lapenna afaa1433ff chore(version): bump version number 2016-07-08 16:06:46 +12:00
Anthony Lapenna f923016052 style(lint): fix jshint issues 2016-07-08 15:50:16 +12:00
Anthony Lapenna ca27e7f27a fix(containerCreation): fix an issue when creating an image from a custom registry without automatic pulling (#50) 2016-07-08 15:40:13 +12:00
Anthony Lapenna 8fd9c2fce2 refactor(ui): remove useless logging statement 2016-07-08 15:39:32 +12:00
Anthony Lapenna d4ca060945 feat(ui): add the ability to pull an image from a selection of registry 2016-07-08 15:31:09 +12:00
Anthony Lapenna d124c21d1b feat(ui): add the ability to create a container from an image in a custom registry (#49) 2016-07-08 12:52:26 +12:00
Anthony Lapenna d2fb2cb863 feat(ui): add the ability to pull an image from a private registry (#47) 2016-07-08 11:57:24 +12:00
Anthony Lapenna 0350daca8d Merge branch 'hide-containers-dashboard-swarm' into internal 2016-07-07 15:38:42 +12:00
Anthony Lapenna 06f54e300c fix(ui): hidden containers (using label) are now removed from dashboard and swarm view (#46) 2016-07-07 15:37:09 +12:00
Anthony Lapenna 7856276092 fix(ui): hidden containers (using label) are now removed from dashboard and swarm view 2016-07-07 15:34:05 +12:00
Anthony Lapenna bf14dcc3e8 merge display-all-containers 2016-07-07 14:39:26 +12:00
Anthony Lapenna 21c1778822 feat(ui): default to display all containers (#45) 2016-07-07 14:31:16 +12:00
Anthony Lapenna 337bfa74bb feat(ui): default to display all containers 2016-07-07 14:30:11 +12:00
Anthony Lapenna 418b1ff544 fix(ui): fix display issue with multiple nodes in Swarm view 2016-07-07 13:25:22 +12:00
Anthony Lapenna 092d866c73 fix(ui): fix display issue with multiple nodes in Swarm view (#44) 2016-07-07 13:22:31 +12:00
Anthony Lapenna 50391c87e2 feat(ui): replace ViewSpinner with JQuery animations (#43) 2016-07-07 13:17:44 +12:00
Anthony Lapenna fd6645d068 merge fix-viewspinner 2016-07-07 13:15:56 +12:00
Anthony Lapenna 3a6e326e5e feat(ui): replace ViewSpinner with JQuery animations 2016-07-07 12:44:58 +12:00
Anthony Lapenna b997b787c4 feat(ui): simplify views for internal usage 2016-07-06 19:04:45 +12:00
Anthony Lapenna d227bdfc75 refactor(ui): remove useless controller declarations 2016-07-06 17:42:56 +12:00
Anthony Lapenna b573a8bafa chore(version): bump version number 2016-07-06 16:41:21 +12:00
Anthony Lapenna 59820e737e feat(ui): new pull image view (#39) 2016-07-06 16:32:46 +12:00
Anthony Lapenna 530eb20dfc feat(ui): new network creation view (#37) 2016-07-06 15:38:34 +12:00
Anthony Lapenna 446322dcbe feat(ui): new volume creation view (#36) 2016-07-06 15:14:40 +12:00
Anthony Lapenna 2d311518a7 refactor(ui): fix jshint issue 2016-07-06 14:21:00 +12:00
Anthony Lapenna e6e21e9f46 chore(version): bump version number 2016-07-06 14:04:31 +12:00
Anthony Lapenna f18aa8fe79 fix(ui): fix display of containers per node in Swarm view (#30) 2016-07-06 12:24:49 +12:00
Anthony Lapenna 227e5883e9 feat(ui): new container creation view (#29) 2016-07-06 12:19:09 +12:00
Anthony Lapenna 87e835e873 feat(ui): display an error message when trying to remove a running container (#28) 2016-06-29 22:11:22 +12:00
Anthony Lapenna 66ae15b4fb feat(ui): new containers view (#25) 
feat(ui): new containers view
 2016-06-29 21:04:29 +12:00
Anthony Lapenna 813c14d93c feat(ui): automatically pull the image when creating a container (#24) 
feat(ui): automatically pull the image when creating a container
 2016-06-29 18:09:50 +12:00
Anthony Lapenna ce2e6f80fc chore(version): bump version number 2016-06-24 10:24:27 +12:00
Anthony Lapenna bf4622e4f5 refactor(ui): remove useless logging 2016-06-24 10:23:12 +12:00
Anthony Lapenna 808694d6b5 feat(global): hide containers with labels using -l flag (#19) 2016-06-24 10:11:49 +12:00
Anthony Lapenna cd12243b0f feat(ui): latest Swarm API support (#18) 
* feat(ui): latest Swarm API support
 2016-06-24 10:11:25 +12:00
Anthony Lapenna 91f3b1f138 refactor(service): Config factory returns a promise 2016-06-21 18:35:21 +12:00
Anthony Lapenna 1460d69cd1 bump version number 2016-06-16 17:29:12 +12:00
Anthony Lapenna a7619b06ba configuration is now exposed in /config endpoint (#13) 2016-06-16 17:27:07 +12:00
Anthony Lapenna e7a836a6b2 bump version number 2016-06-14 14:36:20 +12:00
Anthony Lapenna 6d163ee1ef add a refresh link for each entity view (#12) 2016-06-14 14:32:44 +12:00
Anthony Lapenna a12c1916ec switch to angular-ui-router (#11) 2016-06-14 14:13:52 +12:00
Anthony Lapenna 4e1a7077d7 Fix jshint error 2016-06-08 19:15:47 +12:00
Anthony Lapenna a471b77f8d Bumped version number to 1.0.1 2016-06-08 18:36:35 +12:00
Anthony Lapenna 7f5be16db8 merged 2016-06-08 18:34:26 +12:00
Anthony Lapenna 791e069a4c Added header directive and updated breadcrumb in each view (#8) 2016-06-08 18:23:11 +12:00
Anthony Lapenna b3b3feac66 Bump version number 2016-06-02 18:14:03 +12:00
Anthony Lapenna 0f51cb66e0 Rdash theme integration (#1) 
* Adding latest build to dist.

* Adding latest build to dist.

* Bump other app version.

* Build latest changes.

* Bump version to 0.7.0.

* Version bump to 0.9.0-beta and remote API 1.20.

* Whoah there, back down to 0.8.0-beta.

* Merge branch 'crosbymichael-master' into crosbymichael-dist

* Add volume options in volume creation form

* display swarm cluster information in Swarm tab

* update LICENSE

* update repository URL in status bar

* remove console logs

* do not display Swarm containers anywhere in the UI

* update position for add/remove option on Volumes page

* compliant with swarm == 1.2.0 API support

* update nginx-basic-auth examples with latest nginx and swarm example

* Updated .gitignore

* update .gitignore

* reverted entry for dist/uifordocker in .gitignore

* WIP

* fix linter issues

* added logo

* update repository URL

* update .gitignore (ignore dist/*)

* add lodash

* add containers actions binding (start, stop...)

* replace image icon

* bind remove image action

* bind network remove action

* bind volume remove action

* update logo

* wip on container details

* update logo scaling, favicon and page title

* wip container view

* add containers actions in container view

* add image view

* add network view

* remove useless data in tables

* add pull image, create network modals

* add create volume modal

* update style for createVolume options

* add start container modal

* create volume modal now use a select to display drivers

* add container stats

* add containerTop view in stats view

* fix trimcontainername filter

* add container logs view

* updated .gitignore

* remove useless files/modules

* remove useless chart in image view

* replace $location usage with $state.go

* remove useless swarm example
 2016-06-02 17:34:03 +12:00
Kevan Ahlquist 1b206f223f DockerUI => UI For Docker 2016-04-29 21:57:27 -05:00
Kevan Ahlquist a67206dd8d Version bump, 0.10.1-beta 2016-04-02 21:04:51 -05:00
Kevan Ahlquist 0244bc7317 Fix csrf, send tokens back in header, pass token instead of cookie back to server. 2016-04-02 14:39:30 -05:00
Kevan Ahlquist 15d133324d add gorilla/csrf 
#199
 2016-03-31 23:54:12 -05:00
Kevan Ahlquist 5bf922325a Sanitize text that gets sent to Gritter for notifications, 
#198
 2016-03-31 20:06:46 -05:00
Philip Miglinci d2bc18b575 crosbymichael/dockerui#194 fix toggleAll function by only iterating over filtered objects 
Signed-off-by: Philip Miglinci <p.miglinci@gmail.com>
 2016-03-25 15:29:39 +01:00
Kevan Ahlquist 8cdb675abc Merge pull request #191 from erwin314/show-port-bindings2 
Fixed: Show actual port bindings
 2016-03-23 00:14:03 -05:00
Erwin Molendijk 194aa9a750 Fixed: Show actual port bindings 2016-03-21 11:13:21 +01:00
Erwin Molendijk e21af77246 Revert "Changed: Show automatic port bindings when PublishAllPorts is set." 
This reverts commit bfe9038630.
 2016-03-21 10:36:34 +01:00
Erwin Molendijk bfe9038630 Changed: Show automatic port bindings when PublishAllPorts is set. 2016-03-21 10:21:50 +01:00
Erwin Molendijk a33123469a Fixed: Check if variable is plain object before using isEmptyObject() 2016-03-21 09:25:40 +01:00
Kevan Ahlquist f353dc2c41 Add a global interceptor to catch 'conflict.' API responses. 2016-03-19 18:50:11 -05:00
Kevan Ahlquist db90a0eed7 Add column sorting to networks and volumes pages. 2016-03-19 18:09:17 -05:00
Kevan Ahlquist 93dba3f92f Add column sorting to images page. 2016-03-19 17:45:45 -05:00
Kevan Ahlquist 5a20b9fc04 Add column sorting to containers page. 2016-03-19 17:30:47 -05:00
Kevan Ahlquist 9793c3f3ee Fix jshint errors. 2016-03-07 00:07:46 -06:00
Roman Usachev da1a5ead39 Bugfixes 2016-02-24 10:07:59 +03:00
Roman Usachev f1b5037ee5 Host mode fix 2016-02-24 09:19:02 +03:00
Roman Usachev cf18a3cd60 Null vars fix 2016-02-24 07:16:07 +03:00
Roman Usachev cc1b67575c Null vars fix 2016-02-24 05:43:04 +03:00
Roman Usachev 50d33a07df Filesystem binds edit 2016-02-24 03:13:24 +03:00
Roman Usachev fc0dedfda7 Ports list now using HostConfig.PortBindings 2016-02-24 01:34:20 +03:00
Roman Usachev 35dbacdfff Port bindings edit, HostConfig fix 2016-02-23 20:47:21 +03:00
Roman Usachev ad0d23d686 Container env vars editing using commit and recreate 2016-02-22 09:10:16 +03:00
Kevan Ahlquist 786b94b285 Allow running containers to be committed. 2016-02-16 00:09:12 -06:00
Kevan Ahlquist b244242cb2 Add container name to stats and top pages. 2016-02-15 23:34:55 -06:00
Kevan Ahlquist a198382c06 Bump stats endpoint timeout to 5 seconds, retry on error. 2016-01-23 16:39:31 -06:00
Charlie Murray f62cb483ce Use NetworkSettings.Ports rather than HostConfig.PortBindings to diplay host port bindings 2016-01-18 11:05:08 +00:00
Kevan Ahlquist 9d1193c0b5 Fix network stats error for 1.9.0+ clients, hide networks and volumes better on older clients. 2016-01-10 21:51:51 -06:00
Kevan Ahlquist 2683ddb1ee Add refresh button. 2016-01-10 20:36:22 -06:00
Kevan Ahlquist fe7646e939 Use localStorage to only show 'learn more' banner on first load. 2016-01-10 20:02:04 -06:00
Kevan Ahlquist 00528edd7c Merge branch 'master' into networks-volumes 2016-01-10 19:34:03 -06:00
Michael Crosby 06c2ac4d5c Merge pull request #168 from linquize/chart-max-steps 
Show maximum 10 steps of chart
 2016-01-04 09:28:58 -08:00
Linquize 9260f23d41 DockerUI is the UI for Docker container engine 
It is not only on Linux, but on Windows too.
 2016-01-03 13:55:27 +08:00
Linquize d7082c3959 Show maximum 10 steps of chart 2016-01-03 12:59:43 +08:00
Israel Roldan 6de45cd422 Redirect to container list when removing a container (Fixes #158) 2015-12-24 00:04:47 -06:00
Kevan Ahlquist eede27e263 Implement volumes, hide networks and volumes tabs for APIs older than v1.21. 2015-12-20 21:17:01 -06:00
Kevan Ahlquist 8a900254ae Remove unused Dockerfile service, rename services to match API endpoint names: Docker => Version, System => Info. 2015-12-20 20:23:17 -06:00
Kevan Ahlquist 5f4641af67 Catch plaintext errors for creation and connection, implement network creation, 2015-12-20 20:07:57 -06:00
Kevan Ahlquist 8a4be8b93a Implemented single network view, connect, disconnect, remove. 2015-12-20 19:13:53 -06:00
Kevan Ahlquist a712d5b77e Progress on Networks. 2015-12-17 23:35:04 -06:00
Kevan Ahlquist c3f22fe989 Add custom logo. 2015-12-17 00:08:29 -06:00
Kevan Ahlquist 75085b213a Support RepoTags for versions of the Docker API older than 1.21. 2015-12-13 23:28:28 -06:00
Kevan Ahlquist 1dd1ce2f47 Allow tagging of repo and version and deletion of multiple tags. 2015-11-27 00:31:03 -06:00
Kevan Ahlquist 640c0b39c1 Add labels to container start and display. 2015-11-26 22:33:41 -06:00
Kevan Ahlquist 064ffe2a7c Don't use self-closing select element, causes silent render error on Chrome. 2015-11-26 21:12:53 -06:00
User 3ac1ac6086 Fix containers, images chart scale too small 2015-10-10 17:04:19 +08:00
Kevan Ahlquist 9bdd96527c Convert services.js for safe minification, preserve license comments in javascript files, add missing recess target, remove oboe-browser.min.js from assets. 2015-09-15 00:24:11 -05:00
Kevan Ahlquist c57a75f78f Merge branch 'master' into stats 
Conflicts:
	app/components/containers/containers.html
	app/components/images/images.html
 2015-09-09 22:55:07 -05:00
Kevan Ahlquist a96298db59 Merge pull request #137 from dasJ/filter 
Allow filtering containers and images
 2015-09-09 22:48:19 -05:00
Janne Heß 6719c84a7a Allow filtering images 2015-09-03 13:38:23 +02:00
Janne Heß 13f3335098 Allow filtering containers 
Closes #84
 2015-09-03 13:38:09 +02:00
Janne Heß a79c26a7a4 Rename save button when renaming container 
Closes #120
 2015-09-03 13:00:43 +02:00
Kevan Ahlquist abccb316f8 Updated docs links in services. 2015-08-29 02:38:03 -05:00
Kevan Ahlquist f14e954a9b Lower animation steps, keep 20 datapoints, update every 2 seconds. 2015-08-29 02:11:13 -05:00
Kevan Ahlquist 5d4a2a7c25 Fixed dashboard graphs, Chart.js doesn't like charts being hidden on creation, fixed routing issue to dashboard, version bump. 2015-08-29 01:57:08 -05:00
Kevan Ahlquist ce90515c95 Added network graph 2015-08-29 00:40:24 -05:00
Kevan Ahlquist 5a51495432 Added remaining memory stats, change humansize filter to give more accurate sizes. 2015-08-28 23:26:39 -05:00
Kevan Ahlquist b99fe5bf55 Added memory usage graph. 2015-08-27 01:41:45 -05:00
Kevan Ahlquist d243a83c5c Implemented CPU usage graph, upgraded to Chart.js 1.0.2, broke dashboard charts, tests. 2015-08-26 01:28:08 -05:00
Kevan Ahlquist 6cb658a1ef Fixed grunt style warnings. 2015-08-25 01:07:08 -05:00
Kevan Ahlquist 8a7f8f7c37 Whitespace diff, ran everything through the formatter. 2015-08-25 00:59:54 -05:00
Kevan Ahlquist b7daf91723 Current progress on stats page, nonfunctional. 2015-08-25 00:55:54 -05:00
Karl Gutwin 7748adf0e6 Color and edge cleanup 2015-08-12 16:38:50 -04:00
Karl Gutwin 758ac41648 Color and edge cleanup 2015-08-12 16:37:19 -04:00
Karl Gutwin 3db2008c39 Have to provide a color 2015-08-12 16:22:31 -04:00
Karl Gutwin 34a3f8186a Missed passing run state 2015-08-12 16:20:28 -04:00
Karl Gutwin 8e0baf0e37 Optionally include stopped containers 2015-08-12 16:01:33 -04:00
Karl Gutwin 017863bfc0 VolumesFrom support container names 2015-08-12 14:47:47 -04:00
Haris Michopoulos 394f2f2387 dockerui-118 How to pull images / create container from repo image ? 
-Fixed ViewSpinner variable.
-Hide the modal on submit, show Spinner and show again modal if needed (in case of error)
-Clear modal values after successful pull
 2015-06-22 23:30:16 +02:00
Haris Michopoulos 5dd094e0b1 dockerui-118 How to pull images / create container from repo image ? 
Added a modal dialog that gets user's input (registry, repo, image name and tag) and performs the pull. Some hack was needed to parse the response, since it is not valid json (actually, it seems to be concatenated json objects).
 2015-06-05 17:21:52 +02:00
Kevan Ahlquist e806214d0b Merge branch 'master' into events 2015-05-20 23:44:32 -05:00
Cristiangauma cad8a6dc91 Adding protocol select menu in portBinding during container creation 2015-05-19 22:42:24 +02:00
Kevan Ahlquist ef3596ff32 Merge branch 'master' into events 
Conflicts:
	app/app.js
	index.html
 2015-05-14 01:33:08 -05:00
Kevan Ahlquist c0ae0d8d3f Merge branch 'crosbymichael-master' into bharat-add-commit 
Conflicts:
	app/components/container/container.html
 2015-05-14 01:01:26 -05:00
Fredin, Brock 74c92de1d3 Revert "DockerUI - Comment in Services was broken link. Updated the comment to include the most accurate link representing the Docker API reference material" 
This reverts commit f167f5b49e.
 2015-05-14 00:27:55 -05:00
Fredin, Brock 1688dbd8a0 Merge branch 'master' of https://github.com/BrockFredin/dockerui 
* 'master' of https://github.com/BrockFredin/dockerui:
  Restart Feature - Implementing restart feature for single containers
 2015-05-14 00:22:19 -05:00
Fredin, Brock f167f5b49e DockerUI - Comment in Services was broken link. Updated the comment to include the most accurate link representing the Docker API reference material 2015-05-14 00:21:53 -05:00
Bharath Thiruveedula 968efed6c3 Adding commit button 2015-05-12 22:23:19 +05:30
Fredin, Brock c10dc38a89 Restart Feature - Implementing restart feature for single containers 2015-05-12 00:52:12 -05:00
Roger Abelenda edd6a41d6e Add actions to show upstream and downstream dependencies of a container for easy visualization. 
Additionally updated angular-vis to use version 0.0.4 which already includes the changes of https://github.com/visjs/angular-visjs/pull/22.
 2015-05-02 12:04:31 -03:00
Roger Abelenda 9e713b7b81 Add several 
- Add search box to easily find containers in network. This required an addition to angular-vis which is in a pending pull request: https://github.com/visjs/angular-visjs/pull/22
- Add tooltip to easily visualize container id and image name.
- Add options to hide containers (and showAll to reset view) to ease visualization when there are too many containers.
 2015-05-01 21:41:10 -03:00
Roger Abelenda 008884ec59 Change code to pass lint checks and add angular-vis to karma config for tests to pass. 2015-04-28 23:09:03 -03:00
Roger Abelenda 7cda9a0c7b Add a containers network tab to be able to easily visualize links and volumesFrom relations between containers. 2015-04-25 14:02:24 -03:00
Kevan Ahlquist 6012453d2d Switch to ngOboe, for DI and promise interface. 2015-04-18 23:06:58 -07:00
Kevan Ahlquist 2514672c35 Merge commit '964eac6d530a7600459f92c312d79ee9365b0f9b' into events 
Conflicts:
	app/app.js
	test/unit/app/components/containerController.spec.js
 2015-04-18 21:26:15 -07:00
Houssem BELHADJ AHMED ede37e2e79 Add Docker top feature 2015-03-31 23:37:03 +02:00
Kevan Ahlquist 6080e097da Added date ranges to events. 2015-03-27 16:25:30 -05:00
Kevan Ahlquist 32a4703a53 Added events endpoint. 2015-03-26 14:12:44 -05:00
Houssem BELHADJ AHMED c971189286 Add rename feature 2015-03-12 22:28:01 +01:00
Houssem BELHADJ AHMED f29eaa28ba Jshint & test fix 2015-03-08 18:19:51 +01:00
Kevan Ahlquist fb0a0827b6 Merge commit '974ed1fe0598533747c2cf4c2f21d7830d484431' 
Conflicts:
	app/components/containerLogs/containerLogsController.js
 2015-02-24 23:32:38 -06:00
jonny64 66ba60c475 logs: added spinner during refresh 2015-02-21 18:09:12 +00:00
Kevan Ahlquist 65f7e32f94 Strip headers from logs before display, fixes #94 2015-02-18 22:56:55 -06:00
jonny64 b257216194 logs: reload button 2015-02-16 18:42:46 +00:00
jonny64 df5e7bc867 logs: removed debugging 2015-02-16 18:18:34 +00:00
jonny64 53041efaf1 logs: tail also STDERR 2015-02-16 17:42:02 +00:00
jonny64 87131f4ae3 Merge remote-tracking branch 'origin/master' into logs_tail 2015-02-16 17:37:04 +00:00