Commit Graph

134 Commits

Author SHA1 Message Date
bergware
14e69b877e Docker: added shell/bash selection for console 2018-05-29 14:03:27 +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
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
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
1957869501 Docker minor code adjustment 2018-04-05 16:47:12 +02:00
bergware
78c1b545bb Remove redundant statement 2018-04-05 09:32:27 +02:00
bergware
6780c7292c Docker consistency: move functions to DokcerUitl 2018-04-05 08:51:01 +02:00
bergware
7370ee786f Make "bridge" first network choice in new container creation 2018-04-04 08:37:44 +02:00
bergware
b48a00e366 Fixed DockerCreate regression error 2018-04-04 08:28:21 +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
b59da9ac37 Fixed corner case when 'confName' variable is not defined 2018-03-29 11:48:40 +02:00
bergware
ad4cb2d0d1 Restore Apply button to previous behavior
+ little rewrite to PHP7 syntax
2018-03-28 02:49:20 +02:00
Squidly271
a1bbf6fb40 Fix Create Docker php warning
Fixes #316
2018-03-27 17:20:06 -04:00
bergware
87aee2e8e5 Docker: more support for selective deletion of icon files 2018-03-26 17:21:48 +02:00
bergware
8e59dca50b DockerClient: sort container names alphabetically and port numbers numerically 2018-03-26 13:33:39 +02:00
bergware
70a9ba12bc Dokcer combine used ports and ips in single list 2018-03-25 16:59:05 +02:00
bergware
d98a36df5d Docker code optimization 2018-03-25 10:30:26 +02:00
bergware
84674ba64e Docker code optimization 2018-03-23 12:31:46 +01:00
bergware
fbe5252618 Execute docker commands with timeout 2018-03-23 11:28:54 +01:00
bergware
45c22fa47f Do version checking on source file loading 2018-03-22 18:00:07 +01:00
bergware
4ed9f457de Apply button disabled by default 2018-03-22 14:04:46 +01:00
bergware
bd2a3fc0ec CreateDocker: minor code optimization 2018-03-21 23:28:55 +01:00
bergware
725c30357f Docker add/edit: corrected list of exposed ports and assigned IPs 2018-03-21 14:08:57 +01:00
bergware
ab389a5c8d Docker: unrestricted edit in authoring mode 2018-03-21 13:23:35 +01:00
Squidly271
742af14804 Switch from tabs to spaces 2018-03-17 17:18:19 -04:00
Squidly271
79f4fce086 Docker Security: Remove <script> and <iframe>
Recursively remove any <script> or <iframe> from all elements in a template
2018-03-17 17:08:00 -04:00
Squidly271
a62a0b1861 Plug security hole in docker template Post Args 2018-03-17 13:51:57 -04:00
Tom Mortensen
1cf53ae6cd Plug Security Hole In Docker Template PostArgs 2018-03-16 22:48:33 -07:00
bergware
dab47cb568 Revert "Inhibit arbitrary command execution in Docker post arguments"
This reverts commit 99b76766a0.
2018-03-16 20:15:19 +01:00
bergware
99b76766a0 Inhibit arbitrary command execution in Docker post arguments 2018-03-16 20:07:09 +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
tom mortensen
81bdbd3137 Merge pull request #288 from Squidly271/6.4-wip
Don't show Template Dropdown in Add Container when referrer is Community Applications
2018-03-12 13:37:34 -07:00
Squidly271
113d70bb52 Don't show Template Dropdown in Edit Container when referrer is Community Applications 2018-03-11 21:30:33 -04:00
Squidly271
37a4c9a5c0 Prevent text overlapping input boxes
See here: https://lime-technology.com/forums/topic/56392-support-djoss-dupeguru/?page=2&tab=comments#comment-639931
2018-03-11 15:21:59 -04:00
bergware
cf0c87cbd9 Standardize VM folder structure (step 3)
Move javascript file in correct folder (sorry overlooked this one)
2018-03-07 20:19:58 +01:00
bergware
1ab5d925c1 Minor code cleanup 2018-03-06 09:58:44 +01:00
bergware
8eb2e1f756 Enhancements to Docker settings and overview 2018-03-05 12:26:41 +01:00