diff --git a/docs/networking/proxies/caddy.md b/docs/networking/proxies/caddy.md index ed713f960..454086960 100644 --- a/docs/networking/proxies/caddy.md +++ b/docs/networking/proxies/caddy.md @@ -125,10 +125,10 @@ Refer to the upstream [caddy-docker-proxy](https://github.com/lucaslorentz/caddy #### Adding a label -To add a custom container label to an app, use the `caddy:label:add` command: +To add a custom container label to an app, use the `caddy:labels:add` command: ```shell -dokku caddy:label:add node-js-app caddy.directive value +dokku caddy:labels:add node-js-app caddy.directive value ``` This will add the label `caddy.directive=value` to the app's containers. After adding a label, you will need to rebuild or redeploy the app for the label to be applied to running containers. @@ -139,10 +139,10 @@ dokku ps:rebuild node-js-app #### Removing a label -To remove a custom container label from an app, use the `caddy:label:remove` command: +To remove a custom container label from an app, use the `caddy:labels:remove` command: ```shell -dokku caddy:label:remove node-js-app caddy.directive +dokku caddy:labels:remove node-js-app caddy.directive ``` This will remove the specified label from the app. After removing a label, you will need to rebuild or redeploy the app for the change to be applied to running containers. @@ -153,16 +153,16 @@ dokku ps:rebuild node-js-app #### Showing labels -To view all custom container labels for an app, use the `caddy:label:show` command: +To view all custom container labels for an app, use the `caddy:labels:show` command: ```shell -dokku caddy:label:show node-js-app +dokku caddy:labels:show node-js-app ``` To view a specific label value, provide the label name: ```shell -dokku caddy:label:show node-js-app caddy.directive +dokku caddy:labels:show node-js-app caddy.directive ``` ### SSL Configuration diff --git a/docs/networking/proxies/haproxy.md b/docs/networking/proxies/haproxy.md index eeba92578..13b0f2272 100644 --- a/docs/networking/proxies/haproxy.md +++ b/docs/networking/proxies/haproxy.md @@ -121,10 +121,10 @@ Refer to the upstream [EasyHaproxy](https://github.com/byjg/docker-easy-haproxy) #### Adding a label -To add a custom container label to an app, use the `haproxy:label:add` command: +To add a custom container label to an app, use the `haproxy:labels:add` command: ```shell -dokku haproxy:label:add node-js-app haproxy.directive value +dokku haproxy:labels:add node-js-app haproxy.directive value ``` This will add the label `haproxy.directive=value` to the app's containers. After adding a label, you will need to rebuild or redeploy the app for the label to be applied to running containers. @@ -135,10 +135,10 @@ dokku ps:rebuild node-js-app #### Removing a label -To remove a custom container label from an app, use the `haproxy:label:remove` command: +To remove a custom container label from an app, use the `haproxy:labels:remove` command: ```shell -dokku haproxy:label:remove node-js-app haproxy.directive +dokku haproxy:labels:remove node-js-app haproxy.directive ``` This will remove the specified label from the app. After removing a label, you will need to rebuild or redeploy the app for the change to be applied to running containers. @@ -149,16 +149,16 @@ dokku ps:rebuild node-js-app #### Showing labels -To view all custom container labels for an app, use the `haproxy:label:show` command: +To view all custom container labels for an app, use the `haproxy:labels:show` command: ```shell -dokku haproxy:label:show node-js-app +dokku haproxy:labels:show node-js-app ``` To view a specific label value, provide the label name: ```shell -dokku haproxy:label:show node-js-app haproxy.directive +dokku haproxy:labels:show node-js-app haproxy.directive ``` ### SSL Configuration diff --git a/docs/networking/proxies/openresty.md b/docs/networking/proxies/openresty.md index b56db421b..d1597be95 100644 --- a/docs/networking/proxies/openresty.md +++ b/docs/networking/proxies/openresty.md @@ -132,10 +132,10 @@ Refer to the upstream [openresty-docker-proxy](https://github.com/dokku/openrest #### Adding a label -To add a custom container label to an app, use the `openresty:label:add` command: +To add a custom container label to an app, use the `openresty:labels:add` command: ```shell -dokku openresty:label:add node-js-app openresty.directive value +dokku openresty:labels:add node-js-app openresty.directive value ``` This will add the label `openresty.directive=value` to the app's containers. After adding a label, you will need to rebuild or redeploy the app for the label to be applied to running containers. @@ -146,10 +146,10 @@ dokku ps:rebuild node-js-app #### Removing a label -To remove a custom container label from an app, use the `openresty:label:remove` command: +To remove a custom container label from an app, use the `openresty:labels:remove` command: ```shell -dokku openresty:label:remove node-js-app openresty.directive +dokku openresty:labels:remove node-js-app openresty.directive ``` This will remove the specified label from the app. After removing a label, you will need to rebuild or redeploy the app for the change to be applied to running containers. @@ -160,16 +160,16 @@ dokku ps:rebuild node-js-app #### Showing labels -To view all custom container labels for an app, use the `openresty:label:show` command: +To view all custom container labels for an app, use the `openresty:labels:show` command: ```shell -dokku openresty:label:show node-js-app +dokku openresty:labels:show node-js-app ``` To view a specific label value, provide the label name: ```shell -dokku openresty:label:show node-js-app openresty.directive +dokku openresty:labels:show node-js-app openresty.directive ``` ### SSL Configuration diff --git a/docs/networking/proxies/traefik.md b/docs/networking/proxies/traefik.md index f8163fca0..a6718f0fa 100644 --- a/docs/networking/proxies/traefik.md +++ b/docs/networking/proxies/traefik.md @@ -135,10 +135,10 @@ Refer to the upstream [Traefik](https://doc.traefik.io/traefik/) documentation f #### Adding a label -To add a custom container label to an app, use the `traefik:label:add` command: +To add a custom container label to an app, use the `traefik:labels:add` command: ```shell -dokku traefik:label:add node-js-app traefik.directive value +dokku traefik:labels:add node-js-app traefik.directive value ``` This will add the label `traefik.directive=value` to the app's containers. After adding a label, you will need to rebuild or redeploy the app for the label to be applied to running containers. @@ -149,10 +149,10 @@ dokku ps:rebuild node-js-app #### Removing a label -To remove a custom container label from an app, use the `traefik:label:remove` command: +To remove a custom container label from an app, use the `traefik:labels:remove` command: ```shell -dokku traefik:label:remove node-js-app traefik.directive +dokku traefik:labels:remove node-js-app traefik.directive ``` This will remove the specified label from the app. After removing a label, you will need to rebuild or redeploy the app for the change to be applied to running containers. @@ -163,16 +163,16 @@ dokku ps:rebuild node-js-app #### Showing labels -To view all custom container labels for an app, use the `traefik:label:show` command: +To view all custom container labels for an app, use the `traefik:labels:show` command: ```shell -dokku traefik:label:show node-js-app +dokku traefik:labels:show node-js-app ``` To view a specific label value, provide the label name: ```shell -dokku traefik:label:show node-js-app traefik.directive +dokku traefik:labels:show node-js-app traefik.directive ``` ### SSL Configuration diff --git a/plugins/caddy-vhosts/command-functions b/plugins/caddy-vhosts/command-functions index c2ec92404..56817212e 100755 --- a/plugins/caddy-vhosts/command-functions +++ b/plugins/caddy-vhosts/command-functions @@ -5,28 +5,28 @@ source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/internal-functions" set -eo pipefail [[ $DOKKU_TRACE ]] && set -x -cmd-caddy-label-add() { +cmd-caddy-labels-add() { declare desc="adds container label to app for specified proxy" - declare cmd="caddy:label:add" + declare cmd="caddy:labels:add" [[ "$1" == "$cmd" ]] && shift 1 - cmd-proxy-label-add "proxy:label:add" "caddy" "$@" + cmd-proxy-labels-add "proxy:labels:add" "caddy" "$@" } -cmd-caddy-label-remove() { +cmd-caddy-labels-remove() { declare desc="removes container label from app for specified proxy" - declare cmd="caddy:label:remove" + declare cmd="caddy:labels:remove" [[ "$1" == "$cmd" ]] && shift 1 - cmd-proxy-label-remove "proxy:label:remove" "caddy" "$@" + cmd-proxy-labels-remove "proxy:labels:remove" "caddy" "$@" } -cmd-caddy-label-show() { +cmd-caddy-labels-show() { declare desc="shows container labels for app for specified proxy" - declare cmd="caddy:label:show" + declare cmd="caddy:labels:show" [[ "$1" == "$cmd" ]] && shift 1 - cmd-proxy-label-show "proxy:label:show" "caddy" "$@" + cmd-proxy-labels-show "proxy:labels:show" "caddy" "$@" } cmd-caddy-report() { diff --git a/plugins/caddy-vhosts/commands b/plugins/caddy-vhosts/commands index 69d03291b..de26adef2 100755 --- a/plugins/caddy-vhosts/commands +++ b/plugins/caddy-vhosts/commands @@ -1,5 +1,5 @@ #!/usr/bin/env bash -[[ " caddy:help caddy:label:add caddy:label:remove caddy:label:show help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" +[[ " caddy:help caddy:labels:add caddy:labels:remove caddy:labels:show help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/help-functions" source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/command-functions" set -eo pipefail @@ -10,16 +10,16 @@ case "$1" in cmd-caddy-help "$@" ;; - caddy:label:add) - cmd-caddy-label-add "$@" + caddy:labels:add) + cmd-caddy-labels-add "$@" ;; - caddy:label:remove) - cmd-caddy-label-remove "$@" + caddy:labels:remove) + cmd-caddy-labels-remove "$@" ;; - caddy:label:show) - cmd-caddy-label-show "$@" + caddy:labels:show) + cmd-caddy-labels-show "$@" ;; *) diff --git a/plugins/caddy-vhosts/help-functions b/plugins/caddy-vhosts/help-functions index 6ea1b1f3e..19d17a00e 100755 --- a/plugins/caddy-vhosts/help-functions +++ b/plugins/caddy-vhosts/help-functions @@ -30,9 +30,9 @@ fn-help-content() { caddy:report [] [], Displays an caddy report for one or more apps caddy:set (), Set or clear an caddy property for an app caddy:show-config , Display caddy compose config - caddy:label:add