mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-04 08:49:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

New Docker option to remove or preserve user defined networks

Browse Source
This commit is contained in:
bergware
2018-01-18 11:51:53 +01:00
parent ae168ab3af
commit 435c0f5cfe
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/DockerSettings.page
+19 -4
View File
@@ -119,7 +119,7 @@ Docker vdisk size:
> If the system needs to create a new docker image file, this is the default size to use specified in GB.
>
> To resize an existing image file, specify the new size here. Next time the Docker service is started the file (and file system) will increased to the new size (but never decreased).
> To resize an existing image file, specify the new size here. Next time the Docker service is started the file (and file system) will increased to the new size (but never decreased).
Docker storage location:
: <input id="DOCKER_IMAGE_FILE" type="text" name="DOCKER_IMAGE_FILE" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>" placeholder="e.g. /mnt/disk1/docker.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt/" data-pickfolders="true" required="required">
@@ -132,7 +132,7 @@ Docker storage location:
<span><i class="fa fa-warning icon warning"></i> Path does not exist</span>
<?endif;?><span id="IMAGE_ERROR" class="errortext"></span>
> You must specify an image file for Docker. The system will automatically create this file when the Docker service is first started.
> You must specify an image file for Docker. The system will automatically create this file when the Docker service is first started.
Docker LOG rotation:
: <select name="DOCKER_LOG_ROTATION" class="narrow" onchange="showLogOptions(this.value)">
@@ -163,6 +163,16 @@ Docker LOG number of files:
</select>
</div>
User defined networks:
: <select name="DOCKER_USER_NETWORKS" class="narrow">
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', 'Remove')?>
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'preserve', 'Preserve')?>
</select>
> By default user created networks are removed from Docker. This is done to prevent potential conflicts with the automatic generation of custom networks.
>
> Change this setting to preserve user defined networks, but it is the responsibility of the user to ensure these entries work correctly and are conflict free.
</div>
<?else: /* DOCKER STARTED */?>
<div markdown="1" class="advanced">
@@ -181,6 +191,11 @@ Docker LOG rotation:
> By default a single unlimited LOG file is created. Otherwise LOG file size and number of files are limited when LOG rotation is enabled.
User defined networks:
: <?=ucfirst($dockercfg['DOCKER_USER_NETWORKS']??'remove').'d'?>
> Shows whether user defined networks are removed or preserved from Docker. When preserved user defined networks become available in the *Network type* dropdown list of containers.
</div>
<?endif;?>
<div markdown="1" class="advanced">
@@ -194,7 +209,7 @@ Default appdata storage location:
> You can specify a folder to automatically generate and store subfolders containing configuration files for each Docker app (via the /config mapped volume).
>
> Only used when adding new Docker apps. Editing existing Docker apps will not be affected by this setting.
> Only used when adding new Docker apps. Editing existing Docker apps will not be affected by this setting.
<!--
Auto-map user shares to containers as /unraid:
@@ -205,7 +220,7 @@ Auto-map user shares to containers as /unraid:
> You can expose all of your user shares (/mnt/user) to a folder named /unraid within Docker containers.
>
> Only used when adding new Docker apps. Editing existing Docker apps will not be affected by this setting.
> Only used when adding new Docker apps. Editing existing Docker apps will not be affected by this setting.
-->
</div>
<div markdown="1" class="advanced">
plugins/dynamix.docker.manager/include/CreateDocker.php
+5 -5
View File
@@ -2,7 +2,7 @@
/* Copyright 2005-2017, Lime Technology
* Copyright 2015-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
*
* Adaptations by Bergware International (May 2016)
* Adaptations by Bergware International (May 2016 / January 2018)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -1585,12 +1585,12 @@ optgroup.title{background-color:#625D5D;color:#FFFFFF;text-align:center;margin-t
<?endforeach;?>
function showSubnet(bridge) {
if (bridge.match(/^(br|eth|bond)[0-9]/) !== null) {
$('.myIP').show();
$('#myIP').html('Subnet: '+subnet[bridge]);
} else {
if (bridge.match(/^(bridge|host|none)$/i) !== null) {
$('.myIP').hide();
$('input[name="contMyIP"]').val('');
} else {
$('.myIP').show();
$('#myIP').html('Subnet: '+subnet[bridge]);
}
}
function reloadTriggers() {