Commit graph

64 commits

Author SHA1 Message Date
Paul Donald
568b44edb3
Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview
luci-app-dockerman: hide config buttons in overview page
2023-12-04 15:06:17 +01:00
Liangbin Lian
0fbbed4a84 luci-app-dockerman: fix stats page always blank
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
2023-10-26 20:01:44 +08:00
Liangbin Lian
7cc4aeb5c3 luci-app-dockerman: hide config buttons in overview page
Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
2023-10-26 19:56:37 +08:00
Felix Baumann
6afe7d91e5 luci-app-dockerman: fix typos
useage > usage

Signed-off-by: Felix Baumann <felix.bau@gmx.de>
2023-09-03 00:51:46 +02:00
Jo-Philipp Wich
39d387f34c luci-app-dockerman: gracefully handle empty registry mirror setting
Fixes: #6300
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2023-04-28 23:43:58 +02:00
Jonathon Walker
848f8ffc3d luci-app-dockerman: change default to nil if data.blkio_weight is not defined
Fixes: #5327
Signed-off-by: Jonathon Walker <jonathon.l.walker@gmail.com>
2022-10-18 23:22:40 +02:00
Andrew Dodd
0c1fc7f645 luci-app-dockerman: Update to play nice with recent changes
180d39dcd2 broke dockerman's appearance in the menus

Make a small change to dockerman's index entry to make it play nice with the new architecture, firstchild() was obtained using DAWN's controller/dawn.lua as an example

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
2022-04-29 14:16:05 -04:00
Jo-Philipp Wich
12cdacdb3f luci-app-dockerman: fix markup which is not valid XHTML
XHTML does not specify `&nbsp;`, use `&#160;` instead.
Also replace `<br>` with `<br />`.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-10-08 19:53:09 +02:00
Florian Eckert
c4f3ac0528 luci-app-dockerman: Carelessness fixed during branch rebasing
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-21 22:56:50 +02:00
Florian Eckert
ad05a0187b luci-app-dockerman: revised the information for the individual page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-19 16:18:01 +02:00
Florian Eckert
a9b196edaf luci-app-dockerman: move docker uci configuration to own page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:26:04 +02:00
Florian Eckert
483f1005b1 luci-app-dockerman: if remote_endpoint is selected a port must be set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:52 +02:00
Florian Eckert
2ffdf1988e luci-app-dockerman: if remote_endpoint is selected a host must be set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:42 +02:00
Florian Eckert
f406004c9c luci-app-dockerman: add datatype and detail info for remote_host option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:35 +02:00
Florian Eckert
0e29a0ecc6 luci-app-dockerman: add log_level i18n translation
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:28 +02:00
Florian Eckert
36869ffd2b luci-app-dockerman: do not set log_level for dockerd default setting
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:20 +02:00
Florian Eckert
9fd1278698 luci-app-dockerman: do not preset value selection
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:13 +02:00
Florian Eckert
ec564ddf6b luci-app-dockerman: set examle registry url as placeholder
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:25:06 +02:00
Florian Eckert
a9fe74d8fb luci-app-dockerman: remove setting default bip option
If no bip option is set, then the default configuration of dockerd should
be used. The option does not need to be set explicitly.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:24:59 +02:00
Florian Eckert
63c5cb5614 luci-app-dockerman: removal of the option socket_path
This option is for debug purposes only. It makes no sense to offer this
option to the user. Especially as it is not used for a remote
connection.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-04-08 16:24:38 +02:00
Hannu Nyman
2bbde8568a luci-app-dockerman: set fallback default of rollback to 90s
Set the fallback value of the config change rollback timeout
to 90 seconds to match the change in /etc/config/luci by commit
81cf99a50.

That commit changed the value in the config file, but did
not change the underlying fallback values that do get applied
when there is no proper config item in etc/config/luci.

Users sysupgrading from old systems may have carried an ancient
/etc/config/luci (without rollback config) with them, so this
change should help them to see the intended user experience.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-10-21 18:47:38 +03:00
Paul Spooren
c4a4e43e2e treewide: replace which with command -v
Fix shellcheck SC2230
> which is non-standard. Use builtin 'command -v' instead.

Once applied to everything concerning OpenWrt we can disable the busybox
feature `which` and save 3.8kB.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-08-20 15:54:54 -10:00
Florian Eckert
2ce27ed582 luci-app-dockerman: change common translation for new container to add
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
3e99b18661 luci-app-dockerman: add edit button to containers list
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
8a961da6da luci-app-dockerman: fix typo
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
16316b3c2f luci-app-dockerman: improve newnetwork view
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
04a14ed370 luci-app-dockerman: fix console connection
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
169c136d61 luci-app-dockerman: fix socket definition
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:42 +02:00
Florian Eckert
400985d020 luci-app-dockerman: set overview to first menu entry
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:36 +02:00
Florian Eckert
6bd215fe82 luci-app-dockerman: controller/dockerman: clean up action event generation
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-08-11 12:55:36 +02:00
Florian Eckert
c724c20b83 luic-app-dockerman: move svg into own files
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 16:58:45 +02:00
Florian Eckert
833aebaa64 luci-app-dockerman: view/dockerman: update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 16:27:03 +02:00
Florian Eckert
25539b2d98 luci-app-dockerman: model/docker: update options object for status_path
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 11:43:10 +02:00
Florian Eckert
3794693675 luci-app-dockerman: model/docker: socket path variable name
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 11:43:02 +02:00
Florian Eckert
543498d88e luci-app-dockerman: model/docker: update debug handling
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 11:42:53 +02:00
Florian Eckert
02af2e6eca luci-app-dockerman: add bip option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 09:17:01 +02:00
Florian Eckert
182c3012da luci-app-dockerman: unify socket_path and hosts by adding the prefix unix://
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-29 09:10:50 +02:00
Florian Eckert
c19a7d18e5 luci-app-dockerman: cbi/container fix indent
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 16:05:02 +02:00
Florian Eckert
dff11ad240 luci-app-dockerman: refactoring remote endpoint options
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 16:03:11 +02:00
Florian Eckert
18c2fef8b3 luci-app-dockerman: update uci hosts translation
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:51:17 +02:00
Florian Eckert
edb53058d0 luci-app-dockerman: model/docker refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:30 +02:00
Florian Eckert
2b2620f890 luci-app-dockerman: model/docker update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
7e4f4ca558 luci-app-dockerman: cbi/newcontainer refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
cb65bb3d8e luci-app-dockerman: cbi/newcontainer update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
630a66163a luci-app-dockerman: cbi/networks refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
7c784349b9 luci-app-dockerman: cbi/networks update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
0f170c1118 luci-app-dockerman: cbi/images refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
b8f63a5725 luci-app-dockerman: cbi/images update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
18ae86e458 luci-app-dockerman: cbi/containers refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00
Florian Eckert
076ad55c4a luci-app-dockerman: cbi/containers update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-07-28 14:16:14 +02:00