Commit Graph

256 Commits

Author SHA1 Message Date
bergware
9d683de94c Added CPU selection to docker container edit section 2018-08-08 17:23:22 +02:00
bergware
9c0cff4782 Added docker autostart wait period
- fixed autostart entries sometimes wrongly sorted
2018-08-05 13:34:46 +02:00
bergware
befd319968 Show docker allocations in column format 2018-08-01 12:27:32 +02:00
bergware
da70c1f2b7 Added version control in docker API calls 2018-08-01 11:10:58 +02:00
bergware
5a728b1d72 Fixed 'Update All Containers' button sometimes hidden in docker list 2018-08-01 09:37:58 +02:00
tom mortensen
c7bdb313be Merge pull request #350 from Squidly271/master
Prevent arbitrary bash execution or redirection on docker create/run commands
2018-07-20 10:55:59 -07:00
Squidly271
d32b443110 Update link for privileged help text 2018-07-14 09:47:22 -04:00
Squidly271
5f73c64819 More tabs to spaces 2018-06-30 22:11:05 -04:00
Squidly271
8b489e708f Handle escaped single quotes 2018-06-30 22:02:05 -04:00
Squidly271
501d4eaf0c Leading spaces instead of tabs 2018-06-30 21:24:55 -04:00
Squidly271
3f5da6ca9e Prevent docker run command from including arbitrary bash commands or redirection 2018-06-30 21:20:10 -04:00
bergware
ee032dc29b Merge remote-tracking branch 'upstream/master' 2018-06-08 07:57:22 +02:00
Kenneth Tan
0c508f7890 Correct docker container icon name generation 2018-06-08 08:35:24 +08:00
bergware
b3791ccbd1 Merge remote-tracking branch 'upstream/master' 2018-06-05 08:33:52 +02:00
bergware
e90ba2d00f Docker: added cpu load and memory load display 2018-06-03 09:12:22 +02:00
realies
0b0d69d0aa Strip HTML from back-end
HTML tags are converted to HTML entities somewhere along the chain and `CreateDocker.php` generates:

`addLog('<b>Error: Image can not be deleted&lt;br&gt;&lt;i&gt;In use by other container(s)&lt;/i&gt;</b>');` 

![screen shot 2018-06-01 at 02 27 32](https://user-images.githubusercontent.com/5107843/40816307-277e4bc6-6544-11e8-95ac-f207b5c61076.png)
2018-06-01 02:45:09 +01:00
bergware
f751950e1c Make cpu-load and mem-load only visible in advanced mode 2018-05-29 22:20:06 +02:00
bergware
14e69b877e Docker: added shell/bash selection for console 2018-05-29 14:03:27 +02:00
bergware
17088573e7 Docker: added cpu load and memory load display 2018-05-29 14:02:30 +02:00
Eric Schultz
a81508cffe bug fix: prevent deleting user template when (letter case) renaming a docker container 2018-05-26 12:15:36 -05:00
Squidly271
789470f0e5 Remove MinVer & DonateImg from templates
MinVer I though would be far more used, but thus far it doesn't appear to be used at all, and the donation image has been deprecated from the next release of CA
2018-05-18 16:15:24 -04:00
bergware
578d011b43 Fixed regression error in docker_cfg file 2018-05-12 12:39:41 +02:00
tom mortensen
7c9031cf26 Merge pull request #339 from shayne/master
Add support for Docker Labels to Docker plugin
2018-05-07 12:05:47 -07:00
Shayne Sweeney
c1c99f69e1 Add additional %s 2018-05-07 08:53:13 -07:00
Shayne Sweeney
32067e89b4 Add support for Docker Labels to Docker plugin
Docker object labels:
https://docs.docker.com/config/labels-custom-metadata/

More and more containers are taking advantage of container metadata
where environment variables are not necessary.

Traefik is a good example:
https://docs.traefik.io/configuration/backends/docker/#on-containers
2018-05-06 21:55:51 -07:00
bergware
1e667b18ff Docker: add support of custom bridge network without port bindings 2018-05-03 17:50:02 +02:00
bergware
086c53d20e Revert "Docker support custom bridge networks without port bindings"
This reverts commit b2c92084b2.
2018-05-03 17:48:03 +02:00
bergware
b2c92084b2 Docker support custom bridge networks without port bindings 2018-05-03 17:22:21 +02:00
bergware
c144751ac2 Fixed column count in Docker container list 2018-05-02 08:13:23 +02:00
bergware
594dc71d5c Make sorting of Docker and VM list draggable 2018-05-01 22:33:39 +02:00
bergware
d27883494e Make sorting of Docker and VM list draggable 2018-05-01 22:28:14 +02:00
bergware
69b4c6a494 Docker: added pause/resume commands & container console window 2018-05-01 16:37:09 +02:00
bergware
98f48e0640 Added: Docker Pause/Resume all Containers buttons 2018-05-01 12:11:57 +02:00
bergware
a67787cade Docker: added pause/resume commands & container console window 2018-05-01 09:37:31 +02:00
bergware
be36a08c24 Minor code changes 2018-04-27 08:41:56 +02:00
tom mortensen
0c1b591ea0 Merge pull request #334 from Squidly271/patch-2
Docker skip hidden files when listing directories
2018-04-25 16:08:26 -07:00
Squidly271
1b9997f86f Docker skip hidden files when listing directories
Solves the problem with dockerMan pumping out tons of simpleXML errors when a Mac creates its ._ files

See https://lime-technology.com/forums/topic/70636-beta-diskspeed-hard-drive-benchmarking-unraid-6/?page=5&tab=comments#comment-653133  (Hasn't really appeared prior because this template was originally published as a .xml the user had to copy manually onto the flash drive)
2018-04-23 20:39:37 -04:00
Squidly271
75ee98a201 Suppress Docker PHP error if container has no ports exposed or utilized 2018-04-23 20:08:30 -04:00
bergware
86d8d371cc Docker: improved processing of custom network types 2018-04-14 14:49:00 +02:00
bergware
e6e1ca0d19 Docker: improved processing of custom network types 2018-04-14 13:17:49 +02:00
bergware
51e12e4fd1 Added custom bridge networks in dropdown list of container network choices 2018-04-14 13:14:30 +02:00
bergware
d73897a10e Docker: improved processing of custom network types 2018-04-14 13:06:42 +02:00
bergware
dd5f2ca5a4 Fixed creation of custom bridge networks 2018-04-14 10:58:37 +02:00
bergware
a5a5e040da Added custom bridge networks in dropdown list of container network choices 2018-04-14 10:14:59 +02:00
bergware
d6caf03fc8 Add missing csrf_token when adding new container 2018-04-12 00:05:52 +02:00
bergware
33a04f59b7 DockerCreate: show unassigned IP addresses as 0.0.0.0 2018-04-06 07:52:29 +02:00
bergware
a25f490e0c Docker minor code update 2018-04-05 17:57:02 +02:00
bergware
1c4d832865 Docker minor code update 2018-04-05 17:28:52 +02:00
bergware
1957869501 Docker minor code adjustment 2018-04-05 16:47:12 +02:00
bergware
843ba47478 Docker: optimized URL caching 2018-04-05 16:31:18 +02:00