diff --git a/docs/configuration/environment-variables.md b/docs/configuration/environment-variables.md index 839883ee6..b3e9e9030 100644 --- a/docs/configuration/environment-variables.md +++ b/docs/configuration/environment-variables.md @@ -87,6 +87,7 @@ The following config variables have special meanings and can be set in a variety | `PLUGIN_CORE_AVAILABLE_PATH` | `$PLUGIN_CORE_PATH/available"` | `/etc/environment`
`~dokku/.dokkurc`
`~dokku/.dokkurc/*` | The directory that stores all available core plugins. | | `PLUGIN_CORE_ENABLED_PATH` | `$PLUGIN_CORE_PATH/enabled"` | `/etc/environment`
`~dokku/.dokkurc`
`~dokku/.dokkurc/*` | The directory that stores all enabled core plugins. | | `DOKKU_LOGS_DIR` | `/var/log/dokku` | `/etc/environment`
`~dokku/.dokkurc`
`~dokku/.dokkurc/*` | Where dokku logs should be written to. | +| `DOKKU_LOGS_HOST_DIR` | `$DOKKU_LOGS_DIR` | `/etc/environment`
`~dokku/.dokkurc`
`~dokku/.dokkurc/*` | A path on the host that will be mounted into the vector logging container. | | `DOKKU_EVENTS_LOGFILE` | `$DOKKU_LOGS_DIR/events.log` | `/etc/environment`
`~dokku/.dokkurc`
`~dokku/.dokkurc/*` | Where the events log file is written to. | | `DOKKU_APP_NAME` | none | `--app APP` flag | Name of application to work on. Respected by core plugins. | | `DOKKU_APPS_FORCE_DELETE` | none | `--force` flag | Whether to force delete an application. Also used by other plugins for destructive actions. | diff --git a/dokku b/dokku index 5e10bbb97..32683ce30 100755 --- a/dokku +++ b/dokku @@ -59,6 +59,7 @@ export DOKKU_VALID_EXIT=0 export DOKKU_PID="$BASHPID" export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"} +export DOKKU_LOGS_HOST_DIR=${DOKKU_LOGS_HOST_DIR:=$DOKKU_LOGS_DIR} export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"} export DOKKU_CONTAINER_LABEL=dokku diff --git a/plugins/logs/functions.go b/plugins/logs/functions.go index 50c2b5e71..87f6b348b 100644 --- a/plugins/logs/functions.go +++ b/plugins/logs/functions.go @@ -72,6 +72,7 @@ func startVectorContainer(vectorImage string) error { "run", "--detach", "--name", vectorContainerName, common.MustGetEnv("DOKKU_GLOBAL_RUN_ARGS"), "--volume", "/var/lib/dokku/data/logs/vector.json:/etc/vector/vector.json", "--volume", "/var/run/docker.sock:/var/run/docker.sock", + "--volume", common.MustGetEnv("DOKKU_LOGS_HOST_DIR") + ":/var/logs/dokku/apps", vectorImage, "--config", "/etc/vector/vector.json"}, " "))