Commit Graph

99 Commits

Author SHA1 Message Date
bergware
9c0cff4782 Added docker autostart wait period
- fixed autostart entries sometimes wrongly sorted
2018-08-05 13:34:46 +02:00
bergware
da70c1f2b7 Added version control in docker API calls 2018-08-01 11:10:58 +02: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
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
14e69b877e Docker: added shell/bash selection for console 2018-05-29 14:03:27 +02:00
bergware
578d011b43 Fixed regression error in docker_cfg file 2018-05-12 12:39:41 +02: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
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
a25f490e0c Docker minor code update 2018-04-05 17:57:02 +02:00
bergware
843ba47478 Docker: optimized URL caching 2018-04-05 16:31:18 +02:00
bergware
c4a8c69f34 Minor code correction 2018-04-05 13:46:02 +02:00
bergware
70b5308463 Fixed return of IPv4 or IPv6 address 2018-04-05 12:47:20 +02:00
bergware
6780c7292c Docker consistency: move functions to DokcerUitl 2018-04-05 08:51:01 +02:00
bergware
012ef2aa7c Smarter IP address caching 2018-04-04 22:57:08 +02:00
bergware
9545093f09 Remove caching of URL to cope with dynamic IP assignments 2018-04-04 20:28:18 +02:00
bergware
bc03b43a38 Code consistency 2018-04-02 17:15:47 +02:00
bergware
b6d86dc5f7 Docker enhancements and corrections
- delete cache files when container is deleted
- improved handling of user defined networks
-  optimized reading of container and image settings
- improved handling of container IP address assignment
- code optimization and consistency
2018-04-02 13:18:31 +02:00
bergware
6f0b4664d0 Docker only remove icons when container/image is deleted 2018-03-26 16:37:58 +02:00
bergware
8229bc8020 Dokcer code optimization 2018-03-26 11:14:36 +02:00
bergware
2be8b2e0d5 Docker code optimizations 2018-03-25 14:24:12 +02:00
bergware
d98a36df5d Docker code optimization 2018-03-25 10:30:26 +02:00
bergware
c863905b73 Removed "timeout" from dcoker execution
It has no effect when docker hangs
2018-03-25 08:50:19 +02:00
bergware
63356dbf52 Use absolute path in docker call 2018-03-23 12:52:07 +01:00
bergware
1b99f04f01 Docker code optimization 2018-03-23 12:39:22 +01:00
bergware
84674ba64e Docker code optimization 2018-03-23 12:31:46 +01:00
bergware
ec1344d43c Minor syntax change 2018-03-23 11:38:23 +01:00
bergware
fbe5252618 Execute docker commands with timeout 2018-03-23 11:28:54 +01:00
bergware
802637f905 Minor code optimization in Docker sort 2018-03-21 10:43:51 +01:00
Squidly271
d1a8df72ea Add in project 2018-03-19 15:14:16 -04:00
Squidly271
9b49e08396 Docker: Don't automatically update webUI entry on templates
webUI being automatically updated by dockerMan on updates results in people that have as an example reverse proxied their containers and needing to have a different webUI always having to redo their changes.
2018-03-19 15:11:42 -04:00
bergware
a3fe701dfe Allow user sorting preference for containers and VMs
Sorting preference also dictates the sequence in which containers and
VMs are started and stopped (reversed)
2018-03-17 13:53:05 +01:00
bergware
f9a1d237cc Change docker caching to private variables 2018-03-17 08:43:35 +01:00
bergware
395800da1c Minor code layout adjustments 2018-03-17 03:42:35 +01:00
bergware
c79c66d2f9 DockerClient: commented out DEBUG 2018-03-17 03:26:35 +01:00
bergware
2fa3607c23 DockerClient: improved caching 2018-03-17 02:46:21 +01:00
bergware
d9a33e92a4 Regression: fix container sorting 2018-03-17 00:44:29 +01:00
bergware
4550957675 Regression: fix container sorting for Dashboard 2018-03-17 00:42:20 +01:00
bergware
c25aea3d52 DockerClient: code optimizations 2018-03-16 22:30:30 +01:00
bergware
9dfd418dd4 Fixes and improvements for Docker
- fixed deletion of orphan images
- inline list update when removing container or image
- fixed list updating after execution error
- added animation when removing container or image
- delete old xml file when container is renamed
- fixed IP assignment with multiple containers based on the same image
2018-03-16 17:15:21 +01:00
Squidly271
990c785b06 PHP Warning Update 2018-03-02 20:56:27 -05:00
Squidly271
6965583061 Add in Support & Project Links to Docker Context Menu
Every container added in via CA should already have the Support Link present (if added post 6.3)
Majority of apps in CA also have a project link present, but this will only thus far dockerMan hasn't saved that entry on user templates, so the Project link on the context menus will only appear for new containers added after the PR is aproved
2018-01-27 10:13:15 -05:00
Eric Schultz
6c2842eaa1 Fix Docker container status to show "not available" when it fails to check for updates 2017-12-22 07:42:05 -06:00