mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 06:49:40 +02:00
fix(docker/container): container logs viewer error when logging is disabled (#10384)
* fix(docker/container-logs): invalid string breadcrumb * fix(docker/container): let docker select the logging driver by default on container create * fix(docker/container-logs): information panel in container logs when logging is disabled * fix(docker/container): dont include HostConfig.LogConfig if no driver is selected
This commit is contained in:
parent
d678b155ba
commit
ada6b31f69
9 changed files with 74 additions and 6 deletions
|
@ -6,6 +6,7 @@ import { ListView } from '@/react/docker/containers/ListView';
|
|||
import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
||||
import { withReactQuery } from '@/react-tools/withReactQuery';
|
||||
import { withUIRouter } from '@/react-tools/withUIRouter';
|
||||
import { LogView } from '@/react/docker/containers/LogView';
|
||||
|
||||
export const containersModule = angular
|
||||
.module('portainer.docker.react.views.containers', [])
|
||||
|
@ -13,6 +14,13 @@ export const containersModule = angular
|
|||
'containersView',
|
||||
r2a(withUIRouter(withReactQuery(withCurrentUser(ListView))), ['endpoint'])
|
||||
)
|
||||
// the view only contains the information panel when logging is disabled
|
||||
// this is a temporary solution to avoid creating a publicly exposed component
|
||||
// or an AngularJS component until the logs view is migrated to React
|
||||
.component(
|
||||
'containerLogView',
|
||||
r2a(withUIRouter(withReactQuery(withCurrentUser(LogView))), [])
|
||||
)
|
||||
|
||||
.config(config).name;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue