diff options
| author | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2021-01-25 17:46:35 +1000 |
|---|---|---|
| committer | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2021-02-21 11:01:30 +1000 |
| commit | f4cc4c0c70d40d2188ecdc7db3ddf17f77aeb11d (patch) | |
| tree | 5ca89f94618082a78f7b731a6006bba8ca2dd00d | |
| parent | 8f899db305aca18b16a8b4cd7c23a9dd81362417 (diff) | |
dockerd: made registry_mirrors and hosts omittable
* Moved logic out of config writing
* Made default config only specify OpenWrt dictated defaults
Otherwise, docker defaults can be assumed
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
| -rwxr-xr-x | utils/dockerd/files/dockerd.init | 24 | ||||
| -rw-r--r-- | utils/dockerd/files/etc/config/dockerd | 6 |
2 files changed, 17 insertions, 13 deletions
diff --git a/utils/dockerd/files/dockerd.init b/utils/dockerd/files/dockerd.init index c1493ba2b..1eaed6710 100755 --- a/utils/dockerd/files/dockerd.init +++ b/utils/dockerd/files/dockerd.init @@ -136,24 +136,28 @@ process_config() { config_get data_root globals data_root "/opt/docker/" config_get log_level globals log_level "warn" config_get_bool iptables globals iptables "1" + + # Don't add these options by default + # omission == docker defaults config_get bip globals bip "" + config_get registry_mirrors globals registry_mirrors "" + config_get hosts globals hosts "" . /usr/share/libubox/jshn.sh json_init json_add_string "data-root" "${data_root}" json_add_string "log-level" "${log_level}" + json_add_boolean "iptables" "${iptables}" [ -z "${bip}" ] || json_add_string "bip" "${bip}" - json_add_array "registry-mirrors" - config_list_foreach globals registry_mirrors json_add_array_string - json_close_array - json_add_array "hosts" - config_list_foreach globals hosts json_add_array_string - json_close_array - - json_add_boolean iptables "${iptables}" - [ "${iptables}" -ne "0" ] && config_foreach iptables_add_blocking_rule firewall - + [ -z "${registry_mirrors}" ] || json_add_array "registry-mirrors" + [ -z "${registry_mirrors}" ] || config_list_foreach globals registry_mirrors json_add_array_string + [ -z "${registry_mirrors}" ] || json_close_array + [ -z "${hosts}" ] || json_add_array "hosts" + [ -z "${hosts}" ] || config_list_foreach globals hosts json_add_array_string + [ -z "${hosts}" ] || json_close_array json_dump > "${DOCKERD_CONF}" + + [ "${iptables}" -eq "1" ] && config_foreach iptables_add_blocking_rule firewall } start_service() { diff --git a/utils/dockerd/files/etc/config/dockerd b/utils/dockerd/files/etc/config/dockerd index aad1dbb70..6ba850bde 100644 --- a/utils/dockerd/files/etc/config/dockerd +++ b/utils/dockerd/files/etc/config/dockerd @@ -8,9 +8,9 @@ config globals 'globals' # option alt_config_file '/etc/docker/daemon.json' option data_root '/opt/docker/' option log_level 'warn' - list hosts 'unix:///var/run/docker.sock' - option bip '172.18.0.1/24' -# option iptables '0' + option iptables '1' +# list hosts 'unix:///var/run/docker.sock' +# option bip '172.18.0.1/24' # list registry_mirrors 'https://<my-docker-mirror-host>' # list registry_mirrors 'https://hub.docker.com' |