mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-01 07:19:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Additional help to clarify docker network setup.

Browse Source
This commit is contained in:
dlandon
2022-10-31 15:03:44 -05:00
parent 20e36c590c
commit 29b0ceb327
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
languages/en_US/helptext.txt
+3 -8
View File
@@ -1033,9 +1033,9 @@ Allows direct communication between the host and containers using a custom **mac
:end
:docker_user_defined_network_help:
User created networks are networks created by the user outside of the GUI. By default user created networks are removed from Docker. This is done to prevent potential conflicts with the automatic generation of custom networks.
Set to **No** to remove any preserved networks not defined in the GUI from Docker. This prevents a preserved network of the same name from overwriting an auto generated network.
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.
Set to **Yes** to preserve all networks so they are available to Docker. Any preserved *networks* then become available in the *Network type* dropdown list of containers. This may cause confilcts if the preferred network has the same name as an auto generated network.
:end
:docker_include_interface_vlan_ipv4_help:
@@ -1078,10 +1078,6 @@ This is the storage location for Docker containers.
By default a single unlimited LOG file is created. Otherwise LOG file size and number of files are limited when LOG rotation is enabled.
:end
:docker_user_defined_network_active_help:
Shows whether networks created outside of the GUI are removed or preserved for Docker. When preserved *user defined networks* become available in the *Network type* dropdown list of containers.
:end
:docker_scrub_help:
**Scrub** runs the *btrfs scrub* program to check file system integrity.
@@ -1320,8 +1316,7 @@ Please also refer to the [VFS_FRUIT MAN PAGE](https://www.mankier.com/8/vfs_frui
:end
:smb_enable_netbios_help:
Select 'Yes' to enable NetBIOS. If enabled, SMBv1 protocol will also be recognized. If disabled,
clients must use SMBv2 or higher.
Select 'Yes' to enable NetBIOS. If enabled, SMBv1 protocol will also be recognized. If disabled, clients must use SMBv2 or higher.
:end
:smb_enable_wsd_help:
plugins/dynamix.docker.manager/DockerSettings.page
+10 -5
View File
@@ -137,6 +137,7 @@ span.disabled{color:#404040}
<input type="hidden" name="#cleanup" value="true">
<input type="hidden" name="DOCKER_CUSTOM_NETWORKS" value="<?=implode(' ',$unset)?> ">
<input type="hidden" name="DOCKER_IMAGE_FILE" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>">
_(Enable Docker)_:
: <select id="DOCKER_ENABLED" name="DOCKER_ENABLED">
<?=mk_option($dockercfg['DOCKER_ENABLED'], 'no', _('No'))?>
@@ -151,7 +152,7 @@ _(Enable Docker)_:
:docker_enable_help:
_(Docker Stop Timeout)_:
: <input class='narrow' id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=$dockercfg['DOCKER_TIMEOUT']?>">_(seconds)_
: <input class='narrow' id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=$dockercfg['DOCKER_TIMEOUT']?>" placeholder="10">_(seconds)_
:docker_timeout_help:
@@ -259,11 +260,11 @@ _(Host access to custom networks)_:
:docker_custom_network_access_help:
_(Preserve user defined networks)_:
_(Preserve networks not defined in the GUI)_?
: <select name="DOCKER_USER_NETWORKS">
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', _('No'))?>
<?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'preserve', _('Yes'))?>
</select>
</select>&nbsp;_(Networks to Preserve)_: <?if ($dockercfg['DOCKER_CUSTOM_NETWORKS'] != " "):?><?=$dockercfg['DOCKER_CUSTOM_NETWORKS']?><?else:?><?="none"?><?endif;?>
:docker_user_defined_network_help:
@@ -322,6 +323,7 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
<?endforeach;?>
<?if ($include):?>
:docker_include_interface_vlan_ipv4_help:
<?endif;?>
@@ -351,6 +353,7 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
<?endif;?>
<?endforeach;?>
<?if ($unset && $protocol[$network] != 'ipv6'):?>
:docker_exclude_interface_vlan_ipv4_help:
<?endif;?>
@@ -390,6 +393,7 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
<?endforeach;?>
<?if ($include6):?>
:docker_include_interface_vlan_ipv6_help:
<?endif;?>
@@ -417,6 +421,7 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
<?endif;?>
<?endforeach;?>
<?if ($unset && $protocol[$network] != 'ipv4'):?>
:docker_exclude_interface_vlan_ipv6_help:
<?endif;?>
@@ -459,8 +464,8 @@ _(Host access to custom networks)_:
:docker_custom_network_access_help:
_(Preserve user defined networks)_:
: <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve' ? _('Yes') : _('No')?>
_(Preserved networks)_:
: <?if (($dockercfg['DOCKER_CUSTOM_NETWORKS'] != " ") && ($dockercfg['DOCKER_USER_NETWORKS']=='preserve')):?><?=$dockercfg['DOCKER_CUSTOM_NETWORKS']?><?else:?><?="none"?><?endif;?>
:docker_user_defined_network_help: